commit | 9394305cd706b83662fb060d734ed3e4560d3be6 | [log] [tgz] |
---|---|---|
author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 23:31:41 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:31:41 2017 +0000 |
tree | b712a8922ec8f76d16b247a2045f6fe71e194f05 | |
parent | 170f2b9e7ac04320782861e3c2b909d4c23afd66 [diff] | |
parent | 20756a97eae67ce7d95a35590238a19788e05d19 [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 Change-Id: I976532a5bc3d21d637da69e2f508eeb532ec1996