summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-01 16:00:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-01 16:00:12 +0000
commitd9f637b170341d4e5ea88f4b4aa5e92439640aa5 (patch)
treec4bae421953bc91d5c371c55e86d7c9930a9e518 /tools/aapt2/java/JavaClassGenerator.cpp
parentd8afa764be25f8a5adf03bc82366910084b3a1b3 (diff)
parentcd29b5898930c5ca1f8c25accbf340f76bb2a2c1 (diff)
Merge "Merge "Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev am: ca83d45538 am: 7f8eabf301" into rvc-d1-dev-plus-aosp am: 5be4de54a8" into rvc-qpr-dev-plus-aosp am: cd29b58989
Change-Id: Ic9cf4e245eb35c9bfb51781fb8fa5bdc09298b1e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions