diff options
| author | Matt Pietal <mpietal@google.com> | 2020-06-22 18:03:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 18:03:05 +0000 |
| commit | d66f2ddfeb78cbe58fa5735528cf7898bc85d63d (patch) | |
| tree | bf6f7b7584195cc7abcf440514d21130b9414c4d /opengl/java/android/opengl/Material.java | |
| parent | a641e25930076b3430e477a16907a96cf321856f (diff) | |
| parent | 66d9cd06410ae622e225b460477ef881862e69f4 (diff) | |
Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b37f am: c38d8f0bf1 am: 66d9cd0641
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804
Change-Id: I961bf247ab2fad0e7a13969a0ac1c69c88a64bab
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions