summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2020-12-22 12:34:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-22 12:34:23 +0000
commit379446ed6b1ab288036259959b20b552b623867c (patch)
tree540988aa2251d64a09445806f3894e01d1db9477 /tools/aapt2/java/JavaClassGenerator.cpp
parent465c67dfd52077d3e8cd93e007cd8c7c178985c7 (diff)
parent7c9599f917f345aee60f09b0420cc2e2107b9343 (diff)
[automerger skipped] Merge "Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>" am: 8fe2d292b0 am: 1cc2a1f6ef am: 7c9599f917 -s ours
am skip reason: Change-Id Ib48056d6c332ae5eb006e0e12a80c8505c7313d8 with SHA-1 0b5532967d is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534428 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I60d4c7cea8e47da4da0852f951bb11070452762c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions