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 01:32:51 +0000 (01:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:32:51 +0000 (01:32 +0000)
am: e12285ac47  -s ours

Change-Id: I241cf4fcfae223ab115aff90ba70ac84a2e773d4


Trivial merge