summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2019-05-15 12:25:29 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-15 12:25:29 -0700
commit9171264241544deebe98bb8e462048ad544dee87 (patch)
tree9e690f997a45b12d3a4e68a1c01f78d7146c0e55 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3a314441af8929c45033a505c01e8199815fba1c (diff)
parent977e99d7ff6d4df6d0bbbcba288a8467438e0c80 (diff)
[automerger skipped] Merge "Add NAME_SOURCE_CARRIER for subscription display name." am: fa5c6e2cc6 am: 6793ebe4d1 -s ours
am: 977e99d7ff -s ours am skip reason: change_id Ieb7d691fb88866162b287f87d5a2b2d94adac7c3 with SHA1 24e102e0e0 is in history Change-Id: Ife095b4d8d6a3dc685d724eb34e79fb337e2bdc5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions