diff options
| author | Baligh Uddin <baligh@google.com> | 2014-04-24 15:43:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-24 15:43:59 +0000 |
| commit | 7cb08dd95eec0d940495d1c29dafce387c7c9d0e (patch) | |
| tree | 38ec83c3db823f2d33efca8f4123979b287a646e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c66d1fd79968ad286d3cb6477e762d7e8bdc5ec (diff) | |
| parent | d0af9589ff8971bb02ee764454e3a46b0c2aebaa (diff) | |
am d0af9589: (-s ours) am aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'd0af9589ff8971bb02ee764454e3a46b0c2aebaa':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions