OSDN Git Service

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
authorSuprabh Shukla <suprabh@google.com>
Thu, 2 Feb 2017 22:43:58 +0000 (22:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 22:43:58 +0000 (22:43 +0000)
commitceb288f00b4c9c3c36ba54dcdcbdd6cb0aa18626
treeb712a8922ec8f76d16b247a2045f6fe71e194f05
parentdb40505c42f284577ecc6d55ff881782604afe20
parent429683b46916bf41da762d3c6c614ca94f455130
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710  -s ours am: 14e38a8b21
am: 429683b469

Change-Id: I4998929bae9f510de4dc5828e136921a033ff98e