diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-22 00:07:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-22 00:07:12 +0000 |
commit | 736996e4abef46559229aa1ad6953dc23afeacc3 (patch) | |
tree | 96cb89599b7ad98058be688b99a4ab02075bd933 /tools/aapt2/java/AnnotationProcessor_test.cpp | |
parent | 73806565428c8040ed2ca55a7650678698982d59 (diff) | |
parent | b3b2334a372439af8f5f687322dd7eb914abcc3e (diff) |
Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4becee0 am: 476c64e470 am: 7904074696 am: b3b2334a37
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271
Change-Id: Iaa35d4fca45821e529383afda80c054e7f91644e
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions