tree 9582c84c1cf4184eb2a6f96d1f48011bee6e9cbe
parent 55176e2d5ab7e8bd4ddcf1504aa4e9e4565c4500
parent 170f2b9e7ac04320782861e3c2b909d4c23afd66
author Suprabh Shukla <suprabh@google.com> 1486078269 +0000
committer android-build-merger <android-build-merger@google.com> 1486078269 +0000

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912  -s ours am: 051f01700e  -s ours am: a3685e4bb5  -s ours am: 3f7ed73fdd  -s ours am: 64e2b4f825  -s ours
am: 170f2b9e7a  -s ours

Change-Id: I91a75624e85cf6f32538de378bac43367f118672