OSDN Git Service

Merge "Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked...
authorRicky Wai <rickywai@google.com>
Mon, 13 Jun 2016 13:12:47 +0000 (13:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 13 Jun 2016 13:12:48 +0000 (13:12 +0000)
1  2 
core/res/AndroidManifest.xml
services/core/java/com/android/server/pm/UserManagerService.java

Simple merge