tree 49c3f6ba2d41551a97a195484ae36c3177b8a24b
parent 051f01700e9ac58236b819d5947c4d691b2318dd
parent af85feef363b596cbac066d1eea8bf8c5df7807d
author Suprabh Shukla <suprabh@google.com> 1486076856 +0000
committer android-build-merger <android-build-merger@google.com> 1486076856 +0000

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

Change-Id: Idf57ddf932e98dda06ac9c51f7e230d6a673882b