Skip to content
Commit 20756a97 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into... 

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef  -s ours am: d9c81559  -s ours am: bf1c88f3  -s ours
am: c1a0e6db  -s ours

Change-Id: Ide2acd4e61618be87ad4c32d735a4cd7f3781d0b
parents 64e2b4f8 c1a0e6db
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment