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:13:03 +0000 (23:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 23:13:03 +0000 (23:13 +0000)
am: d9c8155943  -s ours

Change-Id: I9dfff7471440739580e7827cdb4484fad6900048


Trivial merge