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