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