diff options
| author | Treehugger Robot <android-build-prod@system.gserviceaccount.com> | 2020-07-20 21:01:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-20 21:01:09 +0000 |
| commit | 77ec48a8c2c784a9788697be9be1a890cab4ea1b (patch) | |
| tree | 1c9ecb1c70d9d989446685228c617822ad95f745 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c160f489b16108b9781df9c57b7dcba8950c25ec (diff) | |
| parent | 4dac468481091012d514aa979af04f9536624304 (diff) | |
Merge changes from topic "am-20c9aacd-2918-4f34-a41f-58d85888af1f" into r-keystone-qcom-dev
* changes:
[automerger skipped] SystemUI: Don't differentiate between SA and NSA in side-car skipped: a6639181b3
SystemUI: Don't differentiate between SA and NSA in side-car
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions