diff options
| author | Baligh Uddin <baligh@google.com> | 2015-11-05 20:06:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 20:06:18 +0000 |
| commit | 82ab657901ef66fba38c67d7c6589d22cc82e3dd (patch) | |
| tree | b2666280aa1029e5a594fbef024520b211ff45f1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 967f81f5d71312e0978ac72420a589a26f86e1ec (diff) | |
| parent | 97bf3b5922df75ecf5cf8b13f9ba2f338acdaf82 (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 97bf3b5922 -s ours
* commit '97bf3b5922df75ecf5cf8b13f9ba2f338acdaf82':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions