summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-05 01:43:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-05 01:43:20 +0000
commit186600804a0646d43f581a53c230edd06b1fa62d (patch)
treea66e3e04a7d672a6ce14a936d305ca4459689f1b /tools/aapt2/java/JavaClassGenerator.cpp
parent7328a637a0161d80304fff5170235ef9cf900f3a (diff)
parent8e4e8fd6a087c1009cc01356004444dfebbe31f1 (diff)
[automerger skipped] Merge "DO NOT MERGE Remove *.aidl for parcelable declarations from srcs" into qt-dev am: aa23deba63 am: 821024bef1 am: 8e4e8fd6a0 -s ours
am skip reason: Change-Id I0705ddf76b3c628127f65d75e0a8b06c6c250fe2 with SHA-1 7e1339e055 is in history Change-Id: Ie704e9f0d5a3c38ee6f393fb0b5a82e92ae77f31
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions