| commit | 73d19fc1a01d232536b3b4c7c702b070b4b51a58 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 23:01:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:01:14 2017 +0000 |
| tree | 656c411fcd2e3c64c0143ea35f5803697d568792 | |
| parent | 642912652e779153a25e4f78d3646647c486ea92 [diff] | |
| parent | ea91d2d0ccd141db6028d94bb71e06999e454978 [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 am: 5acc268372 -s ours am: ea91d2d0cc Change-Id: I4f5ae380b111b21838744c83eda1e3772d705692