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