OSDN Git Service

Merge "Update Security & screen lock preference"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 22 Feb 2017 03:08:11 +0000 (03:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Feb 2017 03:08:12 +0000 (03:08 +0000)
commit4e1477b60e8bacc7b81e88af735deb51f2d7bb1f
tree5b68b7163b36656a60fabfe8fd0722e18b4e5fca
parentd0db18b3c98eedcb58decf111425896a19566ebc
parent81610543a9d26cf52a4b8aad0bbdde4aa010e197
Merge "Update Security & screen lock preference"
AndroidManifest.xml
res/values/strings.xml
src/com/android/settings/SecuritySettings.java
src/com/android/settings/core/gateway/SettingsGateway.java
src/com/android/settings/location/LocationSettings.java
src/com/android/settings/search/SearchIndexableResources.java