tree 01ae6dc1c3497b585824bcdc0ba16a68ce077304
parent 3380a775163f480f39d41572b06c433d45d42f79
parent 21992d997b7022396a3ac7699679c905b6d6d2bc
author Suprabh Shukla <suprabh@google.com> 1486074963 +0000
committer android-build-merger <android-build-merger@google.com> 1486074963 +0000

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a
am: 21992d997b

Change-Id: Ib5ba5eb63227be2fbf25a79e7f8f8e42b1cc9a2b