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-03 22:53:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-03 22:53:04 +0000
commit7d95c852b11a652b9f4a9544f15dfe23d58e59f6 (patch)
tree59e7422f06c852ad721e1b838cfe907a6702b63e /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbb76de3f76c3f3e32b57bdcc551f5a397290b92d (diff)
parent5af991b0c57e7e2165b6b99d54d0f0ba4aaa74dc (diff)
[automerger skipped] Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)" am: 9bf0c496df am: a2cf5100f0 am: 5af991b0c5 -s ours
am skip reason: Change-Id I76328c2d5aaa3f171bf8afde5b3d1accad8c2e2b with SHA-1 e479728fe2 is in history Change-Id: I2bb156df22e0f0916d9cd050ef2e741c45bad902
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions