summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-04 08:44:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-04 08:44:11 +0000
commit946a72f6adf2232ae0673ac39eab2d13f1f3a45d (patch)
tree37fde5225d42425413df41944035d1fb79078f0a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1a212544a219d83cc34623cc3f48c0580c8a04bb (diff)
parent0488260bd6e401490f2c72b56fcd7cc864732de8 (diff)
[automerger skipped] Merge "Update mapping for the rat type in data stall proto" am: e372df0b69 am: 413ad92be9 am: 0488260bd6 -s ours
am skip reason: Change-Id I12fb14a9b7e70d57ce043bfe2880b358eecea872 with SHA-1 b15c099a80 is in history Change-Id: Ic7202ac4a34a8507942f90fe41cebcf577b8055e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions