summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSongchun Fan <schfan@google.com>2022-01-12 03:52:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-12 03:52:40 +0000
commitb20b70ef904b23c10eddb8b249a09d515ed2a82b (patch)
treeb9fd4e2ab98193d501cede7da9299086b4bf1224 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaa05d41cd663daaea82f09170cd3ef5bcc83fd03 (diff)
parentb004ef6141a374a4288dbdbed879093dedecaa78 (diff)
[automerger skipped] Merge "Persist destroyed staged sessions until they are cleaned up" into qt-dev am: 30348d5cdc am: ca4faab256 -s ours am: 18651732ad -s ours am: 1e04a9cad6 -s ours am: 696461f1a6 -s ours am: b004ef6141 -s ours
am skip reason: Merged-In I4ede6b7a4b5d861e5c73f13884c7aa86cf7633a2 with SHA-1 731bd965fb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16575908 Change-Id: I47ae08f6d4b58afece6c6a94df2630da2ebe324d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions