| commit | 5acc2683729c018eec3e0b85d53c5039e6911440 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 22:49:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 22:49:26 2017 +0000 |
| tree | 9582c84c1cf4184eb2a6f96d1f48011bee6e9cbe | |
| parent | af7a7398897e05723ac9c5883d91d092eedfffec [diff] | |
| parent | ceb288f00b4c9c3c36ba54dcdcbdd6cb0aa18626 [diff] |
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 Change-Id: I6594a2922340e20d226752f0b4a1e99aed7448cb