diff options
author | Yan Yan <evitayan@google.com> | 2021-02-17 21:46:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 21:46:52 +0000 |
commit | e0610fe112554505876b7246f87ab3d21f0d494b (patch) | |
tree | 9fd3f8c14385bc4fb1485e30dc0de183bf2b0721 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 94e09fbe6a0e64e1bf202692b7ea05a450925854 (diff) | |
parent | 14e64c42adbb8b32f001ba50edb194f9ec6cdd14 (diff) |
Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d am: 14e64c42ad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie04f68e463251668d27d636c77dcd39558125ffb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions