OSDN Git Service

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
authorSuprabh Shukla <suprabh@google.com>
Thu, 2 Feb 2017 23:48:18 +0000 (23:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 23:48:18 +0000 (23:48 +0000)
commitbcc2e70d401fe33330b3774d837646ac83ae8b1f
tree656c411fcd2e3c64c0143ea35f5803697d568792
parent56be9656f7ed2ea12a5027dfba1b6f49c7ba3712
parent32c6684a6773faaf8b1e16537853cf451de7edd3
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

Change-Id: I0db97d059b78d12aba30255cfc357f51018d5548