summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2019-06-28 22:12:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-28 22:12:35 -0700
commiteee9ce4b60e26f8f138a8cc8e98b54b43f8f348f (patch)
treea93bf849c2f5c22cee6b3cd763b2590f6adec174 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbebbd558233c6c7fcf7f221de2abe2b2ef7e2752 (diff)
parentb114edfc1932c8bd49f8e77572499ff8ddcc7fa0 (diff)
[automerger skipped] Merge "Disable historical appops" into qt-dev am: 16128cc7a2 am: 0ed8440bba
am: b114edfc19 -s ours am skip reason: change_id I6debd3cbb6768b256eb558a81ba13efea375769b with SHA1 1353bc5b76 is in history Change-Id: If1501f3004a04822d63b6eb390271748e120f304
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions