| commit | ea91d2d0ccd141db6028d94bb71e06999e454978 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 22:56:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 22:56:15 2017 +0000 |
| tree | 3da32226763df0ca6b48734dfaf26e23ba01b0a1 | |
| parent | 5fce769ecf9a335166705daec5a8cc3006832c28 [diff] | |
| parent | 5acc2683729c018eec3e0b85d53c5039e6911440 [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 Change-Id: I2d8425f5da49ba7b1bd451f9ce5e15cfd423b7eb