summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2020-06-03 22:24:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 22:24:49 +0000
commitf0a0963d1de7adb2688ba3ac18245419b3666003 (patch)
tree17e15aad9ee964ce72f75b330e64616e9f1d2529 /tools/aapt2/java/JavaClassGenerator.cpp
parent0295276dfa4d0b528d642e262db2e543cc36fcfe (diff)
parent03f7e9d6fc7b2b7c8c1c031ebf56392cf1ffd5d5 (diff)
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev am: 239ab1c9d6 -s ours am: 03f7e9d6fc -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9f8923d54a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602836 Change-Id: Idd0fd95bcddaeb5f1d964ca63f130bb15a2a9754
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions