tree b50ff9fea8dae4c34b49d2bc84c1e26fb1b1992e
parent 211eae98fce88c7c502eb8f59d956c1a249d77bc
parent acd341d8682ca57c1066d664725ebc72f5ef10c1
author Victoria Lease <violets@google.com> 1368024116 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368024116 -0700

am acd341d8: Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev

* commit 'acd341d8682ca57c1066d664725ebc72f5ef10c1':
  OO NOT MERGE allow connected location providers location access