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)
am: cda0f97790  -s ours

Change-Id: Icdd1d73aed0798a98d960c931dfb36ed9f350212


Trivial merge