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)
commit6f1ed200b3aa01af88eb309a55a428ceac56a9a2
tree79e438186d1e13766bcc4007a58761fd19fc1cc0
parentbecebcbc6deea36326d99fa10e20066949a6cd59
parentb1dd80bcfe8d495478d185a5d88fc2cb981e9c47
Merge "Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked" into nyc-dev
core/res/AndroidManifest.xml
services/core/java/com/android/server/pm/UserManagerService.java