diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-11 17:37:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 17:37:03 +0000 |
| commit | c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274 (patch) | |
| tree | 8b8c2f52f25e4890430db0c1477f4291c6336efa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9ebe031cdc916646e95ffcd92dde67e1655be7ba (diff) | |
| parent | 7138395b26fcad9664ad05b9c98109f60db8a557 (diff) | |
am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7138395b26fcad9664ad05b9c98109f60db8a557':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions