am 478ac277: am b84138c7: Merge change 23806 into eclair
am 478ac277: am b84138c7: Merge change 23806 into eclair

Merge commit '478ac27782a4d68f8726a485781bfd18d1f622e1'

* commit '478ac27782a4d68f8726a485781bfd18d1f622e1':
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.

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