tree a4a767e23fb35dcf6644165947bfa9a6d0e70533
parent e3d5ea3a1872e7c5555716108a57752c6c1f8e32
parent bcc2e70d401fe33330b3774d837646ac83ae8b1f
author Suprabh Shukla <suprabh@google.com> 1486079603 +0000
committer android-build-merger <android-build-merger@google.com> 1486079603 +0000

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36  -s ours am: d9c8155943  -s ours am: bf1c88f34e  -s ours am: c1a0e6db4c  -s ours am: 20756a97ea  -s ours am: 9394305cd7  -s ours am: 9690f8899b  -s ours am: 32c6684a67  -s ours
am: bcc2e70d40  -s ours

Change-Id: I9fd4eab1c0c4728965678e47cffe1c5bfa0b3638