| commit | 21c7ed04546dbee84da715660d35e673272ca5c4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Dec 31 00:45:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 31 00:45:05 2020 +0000 |
| tree | 7f822091ef5f701ed5fd09364872fc1167c806f7 | |
| parent | 16c13f523bd100f95c090110489b31098eabdcfb [diff] | |
| parent | dd7204ab618e0d537dd907e61a85225bebea15a2 [diff] |
[automerger skipped] Merge "Change resource claim to sync to avoid resource conflict" am: f8d7645571 am: 7155480d5a am: dd7204ab61 -s ours am skip reason: Change-Id Ib2688da2a85cdad896f9f2814828ce7659c8a695 with SHA-1 e882c08a9f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538182 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I104c93302f721de7f8fa0ff6445acb1f33c1361f