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