tree 94d24e6cc1303fe2a8b8dd89d1e7fdc9d8c7a98b
parent 4d252c484c62c685068b94278cbb68d8c5c8003f
parent 23025ffd10604fdfebb567307a56e5a20fa5977a
author Mike Lockwood <lockwood@android.com> 1274465975 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274465975 -0700

am 23025ffd: am 11c6847d: Merge "Unhide new location manager APIs:" into kraken