diff options
author | Amit Mahajan <amitmahajan@google.com> | 2019-05-15 22:25:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 22:25:57 -0700 |
commit | 977c1a955496486d9451a3359d7e0ea04e003f05 (patch) | |
tree | 3a94f73e75f983ce864fbcdcf471ecbd93d85c14 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a80c6420cf59e033695ff8656973ee794b2aac77 (diff) | |
parent | 977e99d7ff6d4df6d0bbbcba288a8467438e0c80 (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: I300353ab220dec6e822f6cb1d487af5bf29355ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions