tree 480121d82d3dd4c354d0d09901f2cfe29f69c7b4
parent c5f308b2b1db740600f73b2e77051bf8f08a04d2
parent 376f4f6b913bb5b0b4f37c4e712d8a959d4ff2a9
author Mike Lockwood <lockwood@android.com> 1274463648 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274463648 -0700

am dc0ca1d5: am 88262733: Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken