OSDN Git Service

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
authorSuprabh Shukla <suprabh@google.com>
Thu, 2 Feb 2017 22:29:02 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 22:29:02 +0000 (22:29 +0000)
commitaec526f7102130f4517200f6b882ff83c80c52c5
treebbdc7de04717beaf1be52af8a013e0b96b62b6ea
parentc22e6d15d1781240293c809c2aa4e5fd53224480
parent3ced78bdda802e0769b46c8f72582d0d82973173
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
am: 3ced78bdda

Change-Id: I4da6e2894de769fb028ad713290b62e38925294a