diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-15 12:34:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-15 12:34:47 +0000 |
commit | f684b8d431c8fb814f396288d4cec7b1ebffd623 (patch) | |
tree | c8776ea00392a57a0428ffd5865e0342388313ca /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b79cddd608073b6c4ea93b9e970692d9ea5599c3 (diff) | |
parent | 6011d5240ce04f9c690d69a31ffc9bf2606d3064 (diff) |
Merge "Move the VPN code out of packages/Connectivity." am: 8269d21dec am: 6011d5240c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6c73f67cc7e81025d8c55a437ada9ba4fce34ca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions