OSDN Git Service

Merge "Do not call RecoverySystem with DPMS lock held" into nyc-mr2-dev
authorMakoto Onuki <omakoto@google.com>
Mon, 30 Jan 2017 17:23:21 +0000 (17:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Jan 2017 17:23:21 +0000 (17:23 +0000)
am: 85ecba4423

Change-Id: Ia7b80ed106af9a1aa065230ab4bdae92ef0cba82


Trivial merge