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)
commitb7508c14fe4d45f6321c72ed18d1ced94876934a
tree415cf1c4c1eb3e3005f5d725692eded55fb8d9b1
parent58c56aca52d3566ef5a17d5b24164142c624a9b9
parentbbdd744c21b0f07d90efa86a0c87fbe4732c2467
Merge "Do not call RecoverySystem with DPMS lock held" into nyc-mr2-dev am: 85ecba4423
am: bbdd744c21  -s ours

Change-Id: If1118e9a00ee5b1fa9c7d6672bc18e38b68be0f7