Merge "Do not call RecoverySystem with DPMS lock held" into nyc-mr2-dev

am: 85ecba4423

Change-Id: Ia7b80ed106af9a1aa065230ab4bdae92ef0cba82
This commit is contained in:
Makoto Onuki
2017-01-30 17:23:21 +00:00
committed by android-build-merger

Diff Content Not Available