diff options
| author | Daniel Bright <dbright@google.com> | 2021-01-27 22:17:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-27 22:17:47 +0000 |
| commit | 443fe5fec36d931805289546a0bb07373cbd8b83 (patch) | |
| tree | afe21e2b8d178ba17b8dd1ff73c093b3cc27e98e /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 001dd27a02175c47c22f7d54d9e7f1d50c44b716 (diff) | |
| parent | 50d149ecc665adbc8c7a76d97dcb5d031ea7aafe (diff) | |
[automerger skipped] Merge "Add S-NSSAI" am: d7d4b0ca85 am: 97f11a3ab2 am: 50d149ecc6 -s ours
am skip reason: Change-Id I8f136937f127ff14fedd790526544d5775010da8 with SHA-1 e0820e5e41 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560540
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ea493c239a2c4346471ae50365fc6f42e30ad04
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions