diff options
| author | Geoff Mendal <mendal@google.com> | 2015-11-09 18:07:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-09 18:07:56 +0000 |
| commit | b226c1538b09e8ff5bdcf27bfa91b913b9de6a4e (patch) | |
| tree | 9946e4033957a03607bb1eb6a3c44cf8e00232a8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d7ba82d15440f6d2d6b2c3ce48b7a15e037ab745 (diff) | |
| parent | bd4d7ed0312a828c032b87c31a6bc98316f5f756 (diff) | |
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: f3b3a2ce2b -s ours am: 919b74ae35 -s ours
am: bd4d7ed031 -s ours
* commit 'bd4d7ed0312a828c032b87c31a6bc98316f5f756':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions