| commit | c1a0e6db4c3bc11f591c6d486b6e6fccafe93078 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 23:18:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:18:07 2017 +0000 |
| tree | 068bc1cb444a7e7fd7e9ef3cda6c2957598a6676 | |
| parent | 3f7ed73fdd88e0bd343d2e143d6d76c25461c440 [diff] | |
| parent | bf1c88f34e85c032f32f6d211958b83145a67222 [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 Change-Id: I75d702680bc6ef22e0f60a3c165cd310bf2bb6cf