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