diff options
author | Antoan Angelov <arangelov@google.com> | 2020-06-22 18:05:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 18:05:21 +0000 |
commit | 1b08baf4168985e342d3e5268587e10dffcb6848 (patch) | |
tree | ee331fb67c495a98d5a6ec9942e0b2bfd5496824 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2129ea98da8246a2bd9dbcaf5e5bd0f70abc2eba (diff) | |
parent | 59804dccba4c8da96856e06d1121f07b51391d2c (diff) |
Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086
Change-Id: I897ddd64edd67f7843d6869f0c0f6fbb4e0aa292
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions