OSDN Git Service

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
authorSuprabh Shukla <suprabh@google.com>
Thu, 2 Feb 2017 23:17:40 +0000 (23:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 23:17:40 +0000 (23:17 +0000)
commit7314106770d7af16b812bbbf9c22c79711734a21
tree55574bc456d442131da1bdcbb3053bc6257af3f9
parentd176e0a508b9b46c161bc13446bc042b386b4fda
parentb2cdb4e2ddfe540c2c603174c45ed7da79aa9a7a
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