diff options
| author | Frank Li <lifr@google.com> | 2020-06-23 02:29:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 02:29:12 +0000 |
| commit | a75fbc5c3dc7f1b03f17452133edca6d07a808ac (patch) | |
| tree | 6d58a5eba0161cf918612c7f7f677dba89eff017 /opengl/java/android/opengl/Material.java | |
| parent | 9940fc019148d95ead7ef060c81900fd80917ed3 (diff) | |
| parent | d6db84b14aafbbc01bfaf608747228c46f825aa8 (diff) | |
[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130bf am: 9c01d142fc -s ours am: f593ec5672 -s ours am: 5a5a6b9637 -s ours am: d6db84b14a -s ours
am skip reason: Change-Id Ibefb4a9c03ae0bf3ea9cd2ce186223860aa42e74 with SHA-1 ad14a26c2c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345374
Change-Id: I2b797702edd478353ce01cc6d6af7da5f9d4e541
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions