tree b58ce4a632745481ca6ac65dddb5c620e30d7804
parent b275a205af6014c67a34507240ce0fc1026815b5
parent 2317451acc84174cbe30d1899428d1b2953a4363
author Makoto Onuki <omakoto@google.com> 1485997401 +0000
committer android-build-merger <android-build-merger@google.com> 1485997401 +0000

DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 2317451acc

Change-Id: Id3441141d4feea4c7291350c9670bd59ec017240