tree 6c2283cfb78e0f71e0b9390bfaa86dfd2a9f9306
parent 8bb391016b0afa3e6b2071b1427f48647db53d39
parent 46bfcb996146f96bc387c3db34312f05844d3b37
author Makoto Onuki <omakoto@google.com> 1485998719 +0000
committer android-build-merger <android-build-merger@google.com> 1485998719 +0000

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b am: f1e276384d
am: 46bfcb9961  -s ours

Change-Id: Ie1cd5114414daeb1216827563333ed91df873604