diff options
author | Suprabh Shukla <suprabh@google.com> | 2017-02-03 01:32:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 01:32:51 +0000 |
commit | 1a934fe83615a507e0c6db1c3a504f52f2c5ced2 (patch) | |
tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 /docs/html/sdk/api_diff/21/changes | |
parent | 20ddce26332a1ceccb3ec1d895cabb24d65e9921 (diff) | |
parent | e12285ac47308f5e35421f5bb2d4c0f5ccc6d0b2 (diff) |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours am: cda0f97790 -s ours
am: e12285ac47 -s ours
Change-Id: I241cf4fcfae223ab115aff90ba70ac84a2e773d4
Diffstat (limited to 'docs/html/sdk/api_diff/21/changes')
0 files changed, 0 insertions, 0 deletions