diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-27 16:30:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 16:30:12 +0000 |
| commit | ea382da311059d5a9c31295247ef8470ace84969 (patch) | |
| tree | 0086bc7f9cfd7055094342ae341610753985d4a1 /opengl/java/android/opengl/Material.java | |
| parent | 56ec7701e4644a22f039227cfa5c736fe9aca641 (diff) | |
| parent | 7567ef8abd66396b563c340f0101ab378dd1919f (diff) | |
Merge "Controls UI - Blank activity when launched on lock screen" into rvc-dev am: 18b5f5fa35 am: 99d5a03319 am: 7567ef8abd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004850
Change-Id: I35bfa8d835253b48e3c7954e7d465d5495cbcbb2
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions