summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 01:30:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 01:30:40 +0000
commitf24b09dd211df2c9618784726225f35c573d1410 (patch)
treee2bf702a6bf342eca2111c172e098c896b0561de /opengl/java/android/opengl/Material.java
parent0ee4d287ffc2b0df002640c19f9d80fcbfbfa42a (diff)
parentcd274e0954d4e1a72ba30946bd97b2a8d26bf864 (diff)
Merge "Merge "libafw: Use std::free explicitly for overlays" into rvc-dev am: 5dc36b2f9d am: aec9e504c0" into rvc-d1-dev-plus-aosp am: 68cf3850d2 am: cd274e0954
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11959160 Change-Id: I481871cd4cd788739360fe53c4d7d0f947cfbd35
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions