diff options
author | Songchun Fan <schfan@google.com> | 2022-01-11 23:14:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-11 23:14:07 +0000 |
commit | 697f5464130da5bc11fc0771368dc2903f856075 (patch) | |
tree | 5407647e128f5fdb241a2f750490286de5aabffd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f18956bfbd8aa00e56facbe70e6e0e0a420492a4 (diff) | |
parent | 39415c5787c2b8de9bb0cb84f4d6171545acd3da (diff) |
[automerger skipped] Merge "Don't abandon child sessions (1/n)" into rvc-dev am: 966fd5d60f am: 09acdc8edf -s ours am: e08231618d -s ours am: 39415c5787 -s ours
am skip reason: Merged-In Ib0ba9f3786dda2d3174f3ea8c65d1061a3fcb586 with SHA-1 c981d90b49 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16572034
Change-Id: I6b1053e9dab318c46bff3045242339c1d95c9b68
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions