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:31:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 01:31:22 +0000
commit7dc4457b5978289379e07b30ddbe223f43d60594 (patch)
treee2bf702a6bf342eca2111c172e098c896b0561de /opengl/java/android/opengl/Material.java
parentf24b09dd211df2c9618784726225f35c573d1410 (diff)
parentada52ff7974b4bef7f544a285f832eeeb559006f (diff)
Merge "Merge "libafw: Use std::free explicitly for overlays" into rvc-dev am: 5dc36b2f9d am: aec9e504c0 am: 94f082b4f2" into rvc-qpr-dev-plus-aosp am: ada52ff797
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11959160 Change-Id: I8cd004518bed6dd3e57c78019b967a95b291df56
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions