tree e1ca402b577b1db134a4b139416aa3e1f76647fb
parent b1861c3e89c3e869c95c5c01b78320a1dcef26ad
parent b278933bbf60a3762868c2294412582bb5d23364
author Victoria Lease <violets@google.com> 1347825968 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347825968 -0700

Merge "New location service permission strings." into jb-mr1-dev