summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-05-20 23:09:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-20 23:09:50 +0000
commitb7042bc01385c985f256f70d7dca1c10662be4a5 (patch)
tree38fd4166bc8c5d116325065c5d41ad19f2b1170d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7d2d2e913ebdcd9a7b8c5114bbe46fa53540f028 (diff)
parentedab4b06ffee1b35e13f71c8edb631681f449012 (diff)
Merge "[automerger skipped] Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." into qt-dev am: 39af041253 -s ours am: cbcc67feef -s ours am: 81c7d72c5b -s ours am skip reason: change_id Ia11ecd33f528d01667b1baeb8671b7213a31eef5 with SHA1 42ea026ae7 is in history"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions