commit | ee718b32b83e4859de54916052ebbdd67abb3146 | [log] [tgz] |
---|---|---|
author | Suprabh Shukla <suprabh@google.com> | Fri Feb 03 00:09:52 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:09:52 2017 +0000 |
tree | a128ad02dd6b30e38d604c5b2b1a9ea833f0e9a9 | |
parent | bbed7fcf5175647be2986a409322b37645c86d2e [diff] | |
parent | 339dd0a4b23aff641b7a45a14a33ac29a15caced [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 Change-Id: I71476a462b787607bdfb4c5bfef46869d5ed2ded