OSDN Git Service

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
authorSuprabh Shukla <suprabh@google.com>
Thu, 2 Feb 2017 23:49:45 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 23:49:45 +0000 (23:49 +0000)
am: e3d5ea3a18  -s ours

Change-Id: Ia68ce30d01f44d47f5edd1c7200912179f84efaf


Trivial merge