tree 3f1b75ad95ca3e9cc1101763618ea72915711e06
parent 119a06ce55ce584e4735ceb8eb1315b65b7054aa
parent 963cba5b5b1feea9d66239df6e86fa21c32fd6fd
author Makoto Onuki <omakoto@google.com> 1485998144 +0000
committer android-build-merger <android-build-merger@google.com> 1485998144 +0000

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc
am: 963cba5b5b

Change-Id: I3a1421f656d1a90970eac6156e0840625662fb17