diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-03 09:03:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-03 09:03:43 +0000 |
| commit | c1b8d26058ed2f5dfc28df1a00f2b22fa2679692 (patch) | |
| tree | 40bfa53c4d6ba041301bb350a0e8ec65242221cc /opengl/java/android/opengl/Material.java | |
| parent | 8cd8ac725aa620d4b241c37b55d89bb3654be9f1 (diff) | |
| parent | f86573611de66379f71885b2c38756941dbb0d51 (diff) | |
[automerger skipped] Merge changes from topic "am-3f09b54c701d4e5bb03d55fd8f550bab" into rvc-d1-dev-plus-aosp am: 55a0c624f2 am: f86573611d -s ours
am skip reason: Change-Id Ie30286456af15dd7b81bceb0547ffe8bfac422d2 with SHA-1 ea8a2145c9 is in history
Change-Id: Ibd777fd1ab5b777aab455fbf786b56642f88894a
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions