diff options
| author | Rahul Sabnis <rahulsabnis@google.com> | 2019-11-20 10:44:17 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-20 10:44:17 -0800 |
| commit | 53ed21a49c754044eb62b0eff20270c76f9f30ac (patch) | |
| tree | 34b2ef1a417cc1ef48eed836fb29754cca831f25 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0b60fc71e31c04d06f0c31e522d64675de630b86 (diff) | |
| parent | 35505f61a49277d60b2d78494f5897228de4d17a (diff) | |
[automerger skipped] Merge "DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66"" into qt-qpr1-dev-plus-aosp
am: 35505f61a4 -s ours
am skip reason: subject contains skip directive
Change-Id: I16996eced1fb1be735c2ed83fc518a5ddca3742c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions