diff options
author | Alex Johnston <acjohnston@google.com> | 2020-05-27 13:36:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 13:36:26 +0000 |
commit | cab624e1d168d05da2c96f4c174b358c5764cee5 (patch) | |
tree | 1a39c9e5f9e102329a5a576abd4fabc9847576b8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8dbeca8c3b3bfdb05043d2e3ef1c3fe568ddf6c6 (diff) | |
parent | f997f9a4302cea23394f61d606b147a6c9edb412 (diff) |
Merge "Per-profile user restrictions in org-owned managed profile" into rvc-dev am: 155d909a08 am: f997f9a430
Change-Id: Ia96be69a1061b8ed42dc353857e3bccdb5ad28e4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions