diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-02-26 04:16:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 04:16:21 +0000 |
| commit | e456ac20611d2a92cb2614ad22b420c9757e3bda (patch) | |
| tree | ccffb9446cabeaa18d462fa88a3ef5852bade743 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0492435ea2e6eafa68db16922a2119b0544b98bf (diff) | |
| parent | 25a7767cc70df76a458aa1d0df13b0ed423a38ea (diff) | |
Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1 am: 25a7767cc7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95739021d8f70ce1d5371b21ab4357061082bf16
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions