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-11-12 18:53:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-11-12 18:53:54 +0000
commit6d71381f548fdf831d75a1433c199ce0bf3cc7d4 (patch)
treef40a65be96c2bc79958a2b1ef39572047bf2f9fe /tools/aapt2/java/JavaClassGenerator_test.cpp
parent86f9fc7cf28b9a38135ed6c05574a4e4e25aa8ca (diff)
parent172cdd680b87e5b9884b8431980cb0df1b68e9bb (diff)
Merge "[automerger skipped] Merge "Create new API for MNO carrier id" am: 7e74c4e431 am: 2c8b12a1da am: 87d67c4f19 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions