Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev

am: af85feef36  -s ours

Change-Id: Idf57ddf932e98dda06ac9c51f7e230d6a673882b
This commit is contained in:
Suprabh Shukla
2017-02-02 23:07:36 +00:00
committed by android-build-merger

Diff Content Not Available