diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-21 23:19:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-21 23:19:24 +0000 |
| commit | b3b2334a372439af8f5f687322dd7eb914abcc3e (patch) | |
| tree | e74b417d5d206d1ba4730b38fa0fe5afef2d04d5 /tools/aapt2/java/ClassDefinition.cpp | |
| parent | 3735f6abe49438056bfeec9e0ef9f85f86e3a6bf (diff) | |
| parent | 7904074696f3708db253f7e2004c2b7b5b6c2f9f (diff) | |
Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4becee0 am: 476c64e470 am: 7904074696
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271
Change-Id: I8c62def14eba9348649918e25a23828b93bc37be
Diffstat (limited to 'tools/aapt2/java/ClassDefinition.cpp')
0 files changed, 0 insertions, 0 deletions