OSDN Git Service

Merge "Expand and expose Lockdown global action"
authorChad Brubaker <cbrubaker@google.com>
Mon, 11 Sep 2017 22:04:07 +0000 (22:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 11 Sep 2017 22:04:07 +0000 (22:04 +0000)
commite7454950f62ff7fc90f66cde41b7e6e01352bc73
tree30563e2cc8e27ee9ea212577a9cb2c89d6c9106f
parent516070f52147f96694e76efc287fb6efc9968c34
parent4f28f0de37b00216dbe0f66513735a0ab7dd570d
Merge "Expand and expose Lockdown global action"
core/java/android/provider/Settings.java
core/res/res/values/config.xml