diff options
author | Paul Hu <paulhu@google.com> | 2020-11-05 09:50:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 09:50:21 +0000 |
commit | ca0ac0d202c7ab3d3b7cc745db2d2bbff354e37a (patch) | |
tree | a2625b64a5edb185029a55e16440bb183998151e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 65aa6ea9d19285d96d2f63684ed2124671e5611c (diff) | |
parent | d667289cc613d6dbf97941bb9d834dc2f438281d (diff) |
Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b am: b8eb5b0ee1 am: b892146fb4 am: d667289cc6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021
Change-Id: I5b315cd95cd0be59debb75caf9678845b284b666
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions