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-20 14:51:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-20 14:51:46 +0000
commit7e6457334fa4c84c9b60c3f4dea3f2eaffe9768b (patch)
treee0cc58766e822ac411c0033a1f990fe17705491e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2e8a666e6c9cc8cb141573c781c7749267dc4754 (diff)
parent8161bd3ab621f7a10e0889e53ce538881a9a5b42 (diff)
Merge "RESTRICT AUTOMERGE Use Alternative Prox Sensor for Falsing" into qt-qpr1-dev am: 8161bd3ab6
Change-Id: I7c90e2fb6c8a35b085984030eaf52d3d2ac72299
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions