tree da72313d55ddf4175abd4b4c3fe604acc79dcbd5
parent d5a6453cba323fcd85bface8c9978e2060421bfa
parent 9f074e222489fd752b959c041838ff43a303e7bb
author Charles He <qiurui@google.com> 1492022170 +0000
committer android-build-merger <android-build-merger@google.com> 1492022170 +0000

Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
am: 9f074e2224

Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe