OSDN Git Service

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
authorSuprabh Shukla <suprabh@google.com>
Fri, 3 Feb 2017 01:43:34 +0000 (01:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:43:34 +0000 (01:43 +0000)
am: d11c7025cd  -s ours

Change-Id: Iafd344132d85ea68c337aea9b9f746a7e151b0b2


Trivial merge