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