diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 16:49:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 16:49:13 +0000 |
| commit | ec0835041a423e598e95dbf55189fa81a04a0430 (patch) | |
| tree | 4f26ebdee5451869417d93c06be1cc0f3dc7c20b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a21869fa20af84d405a5b5ffb072802a2c4b92a (diff) | |
| parent | 83a1b9b36ca50594cd1cf6d8378cb9a56ed25870 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c5ad465cf3 -s ours am: 64051151b5 -s ours am: ff5fee19b3 -s ours" into rvc-qpr-dev-plus-aosp am: 83a1b9b36c -s ours
am skip reason: subject contains skip directive
Change-Id: Ifa64f2bf50d6ecbd3f14746890e37fd61d723182
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions