diff options
| author | Ameer Armaly <aarmaly@google.com> | 2020-06-29 17:30:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 17:30:06 +0000 |
| commit | fd302e8e0d22e06d97dbb7f14adab87e42468572 (patch) | |
| tree | f38515056f65926fd86cfe4b299d5cfc4ec07948 /opengl/java/android/opengl/Material.java | |
| parent | 0671a5b88651dc64c9941ba5c9e23d74f551c0ac (diff) | |
| parent | 1ff8d59b82473ac1c2d70b9e35a4c7d99ac9da47 (diff) | |
Merge changes from topic "rollback" into rvc-dev am: 724bc71208 am: cb9a6388e8 am: 911ccc3a51 am: 1ff8d59b82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004859
Change-Id: Iaeff6fcbb34fb0ca087b4d1712c91d7be207d9d1
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions