diff options
author | Alex Johnston <acjohnston@google.com> | 2020-05-27 13:59:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 13:59:17 +0000 |
commit | e3ad2ec865f8b188041a1186d44311c83d17f236 (patch) | |
tree | 009a7e5cf1daa8008669a279b770422ea7d9f3a3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 70c30b8ff61d31a6d311333df1a8df7939de1343 (diff) | |
parent | da609d15ee19ecfefe506e4a3b232834a6d57a8a (diff) |
Merge "Per-profile user restrictions in org-owned managed profile" into rvc-dev am: 155d909a08 am: f997f9a430 am: da609d15ee
Change-Id: If93bea28a64cb0aa8bf80bef0494d80604067e23
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions