| commit | 7155480d5a08e5a8cb3f96cd25103c1f37057da3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Dec 30 23:58:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 30 23:58:09 2020 +0000 |
| tree | 5d5b44adc668048b14d47cf71b317e89a3257288 | |
| parent | 6a62906e48865f21bde23fa7410ae5e9caf595e8 [diff] | |
| parent | f8d764557157383ea93bf22d55d3329e8a5f4649 [diff] |
Merge "Change resource claim to sync to avoid resource conflict" am: f8d7645571 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538182 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifb184d9db19a52f1e9fffee93293be8ec9f7df7b