diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 07:04:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 07:04:44 +0000 |
| commit | 5f6aa76ca2b0ea1375bec8fcb4c07a539a5c82fc (patch) | |
| tree | 45c5f68a09e1bb679be64cf6104e8953765611a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3393c9629c305395e952abef42cea9c4e433d575 (diff) | |
| parent | e7ccdf2aca36a7399a7949043a393978f4dd2d26 (diff) | |
Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e -s ours am: b07add8ebc -s ours" into rvc-qpr-dev-plus-aosp am: e7ccdf2aca -s ours
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 9da9925389 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325669
Change-Id: I4e4ebec9b206d6511e3c82796d1d31e0fb79ec9c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions