OSDN Git Service

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
authorSuprabh Shukla <suprabh@google.com>
Fri, 3 Feb 2017 00:02:16 +0000 (00:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:02:16 +0000 (00:02 +0000)
commit339dd0a4b23aff641b7a45a14a33ac29a15caced
tree790ed169daea5bb44867fbb25a235b1128bf1d8a
parent9c95a9ccc6abda0faa836df396b0633c8e9a2eed
parentcda0f97790438545c23c2fed9f39b80914907ef1
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 am: 6b398f72cb  -s ours
am: cda0f97790  -s ours

Change-Id: Icdd1d73aed0798a98d960c931dfb36ed9f350212