OSDN Git Service

Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
authorSvet Ganov <svetoslavganov@google.com>
Wed, 13 May 2015 23:45:22 +0000 (23:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 23:45:23 +0000 (23:45 +0000)
commit67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc
tree1773bdd2e6e4951e5021fac86f4b10a89edbb632
parent55e6ad78a0a30f917b6f0c135fdf328ebafc68fb
parentf7e9cf4fb48ea80cbc5088204ac3f898109623f7
Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
api/current.txt
api/system-current.txt
core/java/android/provider/Settings.java
core/res/res/values/strings.xml