diff options
| author | Bill Yi <byi@google.com> | 2019-08-06 03:15:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 03:15:50 -0700 |
| commit | 17ad0de71c18083517031fbe8213ef20fe910abc (patch) | |
| tree | caeb38a00810c0dc58a30b33e338e11ffe044dea /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0eaa620dba6b0dc46c8914800f86f717dbb18e7f (diff) | |
| parent | 317af33691a06bcff5f3f909a6f35c5aac428c35 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab6ef4f0df -s ours am: 3633c30ccd -s ours am: 884b0ce1ec -s ours
am: 317af33691 -s ours
am skip reason: subject contains skip directive
Change-Id: I04a48ae0fd98b4f48e579ebd4287b6146de0a5c8
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions