diff options
| author | Junyu Lai <junyulai@google.com> | 2021-02-25 03:59:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-25 03:59:52 +0000 |
| commit | f880b3a5ea82fce74048df87a3fac293f9c9de14 (patch) | |
| tree | c4de7d48cf81b434e39b512be1f4d47b3344cc0f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 825fb31f132d00e0bfef804e53bc16fcea6ac6c0 (diff) | |
| parent | 06aea956872e42a360ee44223c3cb8ab5712f786 (diff) | |
Merge "[VCN07.7] Add NOT_VCN_MANAGED capability into ConnectivityControllerTest" am: 7a0ceca5e4 am: 06aea95687
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib78afdece9a00c7ecf4df734e6458a28ba63d6cc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions