am ba9f5f3f: Merge change 22440 into eclair
am ba9f5f3f: Merge change 22440 into eclair

Merge commit 'ba9f5f3f6b0e499708fb9aa05f30f4a2e7d8b616' into eclair-plus-aosp

* commit 'ba9f5f3f6b0e499708fb9aa05f30f4a2e7d8b616':
  Java-side changes to persist Geolocation permissions between browser sessions.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base