| commit | bf1c88f34e85c032f32f6d211958b83145a67222 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 23:13:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:13:03 2017 +0000 |
| tree | bbdc7de04717beaf1be52af8a013e0b96b62b6ea | |
| parent | a3685e4bb5f9e0b462ea32392dd0ef9b3d43faa9 [diff] | |
| parent | d9c81559436fea31767a7eca05a63060dff4d313 [diff] |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours Change-Id: I9dfff7471440739580e7827cdb4484fad6900048