| commit | d11c7025cd0a294cd767fe3a744676f6c0cb451e | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Fri Feb 03 01:26:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:26:20 2017 +0000 |
| tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
| parent | d4b5177f687c4f3371210c714c8ab52a7c607bcf [diff] | |
| parent | cb84f799ff885076b0bd03a509b7e566479d3c78 [diff] |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd am: cb84f799ff Change-Id: Ic1bffe4a69db81544bfff9543ae94aed0ee4a0f3