commit | b2cdb4e2ddfe540c2c603174c45ed7da79aa9a7a | [log] [tgz] |
---|---|---|
author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 23:12:32 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:12:32 2017 +0000 |
tree | 1ede38a48c23186c7e84d25a339e8c939b4bdf16 | |
parent | 3411150115e7de8b22d99cc9ee6684ac531fb0cc [diff] | |
parent | 5a2e7e2e58e970feef4fe342317eeeada1c728df [diff] |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 Change-Id: I336ce9f979c74df32ea80cd43253485ce184d0c0