tree 3da32226763df0ca6b48734dfaf26e23ba01b0a1
parent 6b1fd0f9cf2320aac17a6018536b2771f0057234
parent 9690f8899b523dd8086eeffe2ab1c0dc9b0269b3
author Suprabh Shukla <suprabh@google.com> 1486078998 +0000
committer android-build-merger <android-build-merger@google.com> 1486078998 +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

Change-Id: Ic815923ff5d6cafced9d155d7188acc4ba8c4d6a