OSDN Git Service

Merge "Disable lock screen by default for demo users" into oc-dr1-dev am: 205585e574
authorChristine Franks <christyfranks@google.com>
Tue, 18 Jul 2017 23:40:43 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 23:40:43 +0000 (23:40 +0000)
commit645011f5fa6fa95e9546e5fff3f164469ab390e7
tree6da6aaeffe34b9b0c2f281fc7351ca0a3407c79c
parent9cc0a8f2dd1948325a0b1fa7e8b737c5db365a42
parent6b43433062c0c6b08b486e3be428d57364338ad4
Merge "Disable lock screen by default for demo users" into oc-dr1-dev am: 205585e574
am: 6b43433062

Change-Id: I9e00e9e2771ba8c2a271c12e8213debbca96b9aa
core/tests/utiltests/AndroidManifest.xml