diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 07:04:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 07:04:32 +0000 |
| commit | 3393c9629c305395e952abef42cea9c4e433d575 (patch) | |
| tree | 45c5f68a09e1bb679be64cf6104e8953765611a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0df12416a7fb8ce2c1ef4c5823cf33c19ee7d603 (diff) | |
| parent | 3e5500dc34449df4e1d447abd79715c5006cf70d (diff) | |
Merge "[automerger skipped] Add a test for starting the legacy VPN. am: c9e026f4e9 am: 6995503731 -s ours" into rvc-qpr-dev-plus-aosp am: 3e5500dc34 -s ours
am skip reason: Change-Id I3c4a94181bd71df68121fa0f71669fa4fa588bdd with SHA-1 4d64450516 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12330622
Change-Id: I40b47a0c828172ffdc19ca04820138048a0f720a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions