| commit | 429683b46916bf41da762d3c6c614ca94f455130 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 22:39:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 22:39:22 2017 +0000 |
| tree | 1f9ce55ae9c5a6c3fa4048fa39bf78813601c99d | |
| parent | 50c6d2ff568ceb7380f26bc008eb12bb6af282f1 [diff] | |
| parent | 14e38a8b21c064980fc502dc3054cd0506a3d79c [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 Change-Id: Ib5e1e997168d33810e36510bebe6783382211059