summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-03-09 18:09:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-09 18:09:24 +0000
commit3008fd049bc28bd897c80cff403b48047f1f7d0b (patch)
treee58b82770caf7df2fedf643fe9b98cd7b5a85a4a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1c3679194b76841fea48edc59bd9c803f8771562 (diff)
parent5b484c013d768fd3e642b5c188b3c32449f98c6c (diff)
Merge changes from topic "am-697b57816ff14b78a80abed4810cfc0f"
* changes: Merge changes from topic "magnifier_expose_size_and_zoom-pi-dev" into pi-dev am: 6d7cbf5e7b am: 41a958ef15 -s ours [Magnifier-29] Expose size and zoom in the API am: 17ea30584a am: ebbcd2da08 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions