| commit | 8be89a2f020382465306b6f62394cbf875d8f6e8 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Fri Feb 03 00:22:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:22:03 2017 +0000 |
| tree | 9b8554401a379ec43a18de16104da8e701126eeb | |
| parent | 9e5f9becf9f10e63b281c854c28cd3a9cf204d85 [diff] | |
| parent | ee718b32b83e4859de54916052ebbdd67abb3146 [diff] |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours am: cda0f97790 -s ours am: 339dd0a4b2 -s ours am: ee718b32b8 -s ours Change-Id: Ie343d1a241ef0554eb844aa51e115dc6c340148b