OSDN Git Service

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
authorSuprabh Shukla <suprabh@google.com>
Thu, 2 Feb 2017 23:06:08 +0000 (23:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 23:06:08 +0000 (23:06 +0000)
commit5a2e7e2e58e970feef4fe342317eeeada1c728df
treea4a767e23fb35dcf6644165947bfa9a6d0e70533
parenta293067f0bb1e973947c94d03d35a1f44f80bac0
parent73d19fc1a01d232536b3b4c7c702b070b4b51a58
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710  -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372  -s ours am: ea91d2d0cc
am: 73d19fc1a0

Change-Id: I3d09ae3d8683f9f4a2c68321eb4fdd9490c9355b