summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2021-01-28 07:42:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-28 07:42:30 +0000
commit2a0bb42e8ef9d861fecc0e6338cb0e891e82843d (patch)
treeb384cbcae9dc408c4709ee66e82359f40ef7479e /tools/aapt2/java/JavaClassGenerator.cpp
parent9bb7ef7bd21fb804e7974e63302106da55291b5e (diff)
parentf8bac85e954a717ccab4a35e11e9ef285821d318 (diff)
Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 4452f55a2e am: f8bac85e95
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I174ab03efc5291c58aa2842831ba2cd62381cf43
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions