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