summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-19 16:29:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-19 16:29:59 +0000
commit63bebcd228b2bfb6d699de6f802290a7a3fec745 (patch)
tree67006c81c3221c9c1b56934445a64b119843a69c /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta424eb688e396eca6b28ce9b7121e7eb7ffb00e5 (diff)
parentccc277e5624eae46c42b7a0e26d2e3e06e9e93a1 (diff)
[automerger skipped] Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb am: 0c1708bfe9 am: 512e8d9828 am: ccc277e562 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380 Change-Id: I6ccf4c1ffc3750fcd4c519dee1332c90860e3bb1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions