diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-01-31 15:29:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-31 15:29:41 +0000 |
| commit | 9db81cadec7b09f84e35912b3a0d2c10ff976be5 (patch) | |
| tree | 77e1983461acb752530ed3b18cfcc3388760953f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 132a502721fcc76eb9ddce475642800956ba3173 (diff) | |
| parent | 2836d8b703451201ed6ebd0a53024d68533a223c (diff) | |
Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b703
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559090
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e9dc75ac6430b70f28ddc974937a4f0d443bd28
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions