diff options
| author | Sarah Chin <sarahchin@google.com> | 2021-03-03 20:24:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 20:24:13 +0000 |
| commit | 2ff39343a09425851324dfcb798d692d935e4e0f (patch) | |
| tree | b14f9a8035af8bfde1139f002cab9a25ddea1a37 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3b9ec373ea2da4da50743678872560f349bcd7f3 (diff) | |
| parent | 770d3084d9cde5faf7b46b15ae0c2e4d353be4e9 (diff) | |
[automerger skipped] Merge "APIs for 5G slicing" am: 08b9f41364 am: f898afeaf8 am: 770d3084d9 -s ours
am skip reason: Change-Id I7433976bfe25bcb2af85ffb9338959cbcc9f42f3 with SHA-1 3543f3c2fb is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c13c91ef58cc52bceac6214aa3fef6f7802fe78
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions