OSDN Git Service

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

Change-Id: If1118e9a00ee5b1fa9c7d6672bc18e38b68be0f7


Trivial merge