diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-08 15:28:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-08 15:28:22 +0000 |
commit | 5cd8ec1a1fa95e59e703a6bf9cbbb64e2646f5f1 (patch) | |
tree | ee2172076965a5942d37b4b7a98a0861d0d62ab8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1ea2b936207d5c3a479bf62e57f2a88c6fd105a5 (diff) | |
parent | 68bf6fa1bb5c63a04cff44ad1ae1bf02734abf10 (diff) |
Merge "Switch VpnDialogs from IConnectivityManager to IVpnManager." am: dbe68e90d7 am: 68bf6fa1bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574868
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I531092f442268da8396c7619b6f8acc05f6724a4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions