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-05-03 09:04:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-03 09:04:35 +0000
commitf29cc998a4dd7a522fe455350ab7552ebd8929ed (patch)
tree40bfa53c4d6ba041301bb350a0e8ec65242221cc /opengl/java/android/opengl/Material.java
parent9db3196fda88306ec7775f3b97bc3506b9150b0b (diff)
parent0d5105f6782234edac6c0e3de9c7a60355245894 (diff)
Merge "[automerger skipped] Replace direct pid writes with setting task profiles am: aeae048088 am: 1073ddc5ca am: 5e18ece7ef am: 5a029f9472 -s ours" into rvc-qpr-dev-plus-aosp am: 0d5105f678 -s ours
am skip reason: Change-Id I05f5a082c7e6f43ab94330aede29967e91d1aef9 with SHA-1 aeae048088 is in history Change-Id: I040b6069279dd3757d47851f7afddc3453b77310
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions