diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 15:53:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-19 15:53:28 +0000 |
| commit | c0e6d6d772097610df1c839f94f18cf2021f62eb (patch) | |
| tree | afbc4a260022d5b2eb43c2f22a3321a835869686 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 512e8d9828918c2ca06455ec89a5b9f3dafa087a (diff) | |
| parent | 0b5cbc733d80b669becf68e77fcdcaee7935b556 (diff) | |
Merge changes from topic "am-f59e5e992a2d448d8991d0ff384a3aa2" into rvc-d1-dev-plus-aosp
* changes:
Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb am: 691e4c6427
「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f am: a4fbb2a737
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions