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