diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 15:20:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 15:20:32 +0000 |
| commit | 51241ed7fe56da4b9c519bf01abc516478425b19 (patch) | |
| tree | 6fbfac4fea500cb19cabc5a23c1b12814f20e0d4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71f166acf11fb9e5f1779993fd3c4946a6bdf637 (diff) | |
| parent | 1c7e8eaaa683af54177415e9a26a25c81e38b236 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b5e2901ec0 -s ours am: d29310da5d -s ours am: 7a8a34442a -s ours" into rvc-qpr-dev-plus-aosp am: 1c7e8eaaa6 -s ours
am skip reason: subject contains skip directive
Change-Id: I87db85a21d1ed45718ea03f0528069b575c3d44e
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions