tree f391c55b8d51c0d840e03890710279f449af211f
parent d28653df6580b76559374580764aa2e86d6c2f48
parent d9ba79ed7c898aa60ee3c5196439d9bac6cbbb59
author Victoria Lease <violets@google.com> 1368024015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1368024015 +0000

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