tree b9da659be1fc7c8d524fad2d3b10c6a9a3cddf4a
parent 0aa645dde8125e5efd46212efa57c4224af86116
parent e3991bb8ff9e69d964b97f2689b7978a43e41510
author Jean-Baptiste Queru <jbq@google.com> 1344457686 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344457686 -0700

am e3991bb8: am 2b16bb99: Merge "Fix LocationManagerTest#testExitProximity"

* commit 'e3991bb8ff9e69d964b97f2689b7978a43e41510':
  Fix LocationManagerTest#testExitProximity