diff options
author | Songchun Fan <schfan@google.com> | 2022-01-11 22:18:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-11 22:18:06 +0000 |
commit | bc1e0e104011e74f6e3567e26b6c9af8eac6001b (patch) | |
tree | 5407647e128f5fdb241a2f750490286de5aabffd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6b46ab945b6a44a16eb040915df8cf827cebcf3f (diff) | |
parent | 7f41fc04fcb58878ecae11873aa62335ab75188a (diff) |
[automerger skipped] Merge "Don't abandon child sessions (1/n)" into rvc-dev am: 966fd5d60f -s ours am: 0f41c5ec5d -s ours am: 556ec39a01 -s ours am: 7f41fc04fc -s ours
am skip reason: Merged-In Ib0ba9f3786dda2d3174f3ea8c65d1061a3fcb586 with SHA-1 d90d334467 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16572034
Change-Id: Idbe79aaef3a6e0a817cd6cf5eb93adbb737ca6c4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions