commit | 14e38a8b21c064980fc502dc3054cd0506a3d79c | [log] [tgz] |
---|---|---|
author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 22:34:55 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 22:34:55 2017 +0000 |
tree | 068bc1cb444a7e7fd7e9ef3cda6c2957598a6676 | |
parent | 3a09dac9c42644017b62d3c88cc55ddaa7e533cb [diff] | |
parent | aec526f7102130f4517200f6b882ff83c80c52c5 [diff] |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours Change-Id: I383f706dfc0690352c3b4d6358ed1269c15ed8b8