| commit | 9690f8899b523dd8086eeffe2ab1c0dc9b0269b3 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 23:37:25 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:37:25 2017 +0000 |
| tree | 9582c84c1cf4184eb2a6f96d1f48011bee6e9cbe | |
| parent | 2b01e24b3f09354624ed9a2ea83855d8b303209f [diff] | |
| parent | 9394305cd706b83662fb060d734ed3e4560d3be6 [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 Change-Id: I15bd6695657f5bf7b802ad5b1119b63f669fc669