tree 068bc1cb444a7e7fd7e9ef3cda6c2957598a6676
parent 14e38a8b21c064980fc502dc3054cd0506a3d79c
parent 6e850f85fc72aca9a818961b50be8e9685d01b6f
author Suprabh Shukla <suprabh@google.com> 1486076183 +0000
committer android-build-merger <android-build-merger@google.com> 1486076183 +0000

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e  -s ours am: ec3e2b9dcb  -s ours am: 483b561f41
am: 6e850f85fc  -s ours

Change-Id: I1cfa1298cf0a1f4f53358242d639ff7f072bc273