diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2019-05-15 12:12:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 12:12:20 -0700 |
| commit | 977e99d7ff6d4df6d0bbbcba288a8467438e0c80 (patch) | |
| tree | c904f66cc541ff9a4ee9db22b6f9f26679978723 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b3a5cbf56d0aeb700ae13d265879237ba04915e2 (diff) | |
| parent | 6793ebe4d1f8138c780cdd558acb37c9c9132f3a (diff) | |
[automerger skipped] Merge "Add NAME_SOURCE_CARRIER for subscription display name." am: fa5c6e2cc6
am: 6793ebe4d1 -s ours
am skip reason: change_id Ieb7d691fb88866162b287f87d5a2b2d94adac7c3 with SHA1 24e102e0e0 is in history
Change-Id: I4436e36e7b92967d6c660be8feebc6e21f1d7e75
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions