commit | 20756a97eae67ce7d95a35590238a19788e05d19 | [log] [tgz] |
---|---|---|
author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 23:24:38 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:24:38 2017 +0000 |
tree | 1f9ce55ae9c5a6c3fa4048fa39bf78813601c99d | |
parent | 64e2b4f825a8b0f594b506f766abf3ebae8b338c [diff] | |
parent | c1a0e6db4c3bc11f591c6d486b6e6fccafe93078 [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 Change-Id: Ide2acd4e61618be87ad4c32d735a4cd7f3781d0b