tree 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f
parent 22a7979f09e4d2de7012e53f17c84f2457ec4862
parent 7bfdae64bdba0520e9f8890998f6894fa34632a9
author Mike Lockwood <lockwood@google.com> 1286562033 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286562033 -0700

am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread

Merge commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21' into gingerbread-plus-aosp

* commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21':
  Remove races in Geocoder/LocationProvider Proxy