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