diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-19 16:30:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 16:30:35 +0000 |
| commit | 12d8f75d788c9915435f4fe7e28935eeb3ed396d (patch) | |
| tree | 67006c81c3221c9c1b56934445a64b119843a69c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dd95bdf2886957551aaeac70d40ca1d230ddcb8c (diff) | |
| parent | 82a9f99f1b465627e519cf628f5b346af9cfcc01 (diff) | |
[automerger skipped] Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb am: 0c1708bfe9 am: 635ab97cb0 am: 82a9f99f1b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380
Change-Id: I1d595582ee48f7f480e7ea8c6840d0a31646c845
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions