tree 6c2283cfb78e0f71e0b9390bfaa86dfd2a9f9306
parent 62c651d4d5a285d8d86cb2c8e4e6bf3ca9b865fe
parent 3ee26841fdb27cf698f84f8847a1d26d260eb015
author Suprabh Shukla <suprabh@google.com> 1486004600 +0000
committer android-build-merger <android-build-merger@google.com> 1486004600 +0000

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c  -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca am: ac8f44e387
am: 3ee26841fd

Change-Id: I7b4d65cc7a3d1b4f575d885e1c71b40a52cc90a4