commit | 7314106770d7af16b812bbbf9c22c79711734a21 | [log] [tgz] |
---|---|---|
author | Suprabh Shukla <suprabh@google.com> | Thu Feb 02 23:17:40 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:17:40 2017 +0000 |
tree | 55574bc456d442131da1bdcbb3053bc6257af3f9 | |
parent | d176e0a508b9b46c161bc13446bc042b386b4fda [diff] | |
parent | b2cdb4e2ddfe540c2c603174c45ed7da79aa9a7a [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 am: b2cdb4e2dd Change-Id: I304954cb2b7d67030714b4b43098aaab4d61c67e