tree 3cc80ad0b7a78983dacc940114fa0bbdbc303a90
parent 1a4f29441913fae0ee7f310d991a657f72fd0ec0
parent e2ee1feb70168bfe573f6531be37543991a7460e
author Mike Lockwood <lockwood@android.com> 1274463462 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1274463462 -0700

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