tree c27335380a43dc5c25d4c63107d1d69dc47880d5
parent 5f9c1b342f1309f90634b78371fffa9c311eda97
parent 6f1ed200b3aa01af88eb309a55a428ceac56a9a2
author Ricky Wai <rickywai@google.com> 1465824147 +0000
committer android-build-merger <android-build-merger@google.com> 1465824147 +0000

Merge \"Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked\" into nyc-dev
am: 6f1ed200b3

Change-Id: Ib9f627511c46a1e23c02e73a008edf264dc01f79