diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-20 19:02:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 19:02:28 +0000 |
| commit | ecf3c574a8cedd3b104b41623d192d61cb039710 (patch) | |
| tree | 088d8fb589ddcd2c31593494aec1a6d7b414421b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8bc12a514918deb5cee9832d9d129c8ed3f7fb4b (diff) | |
| parent | 826f3647a4a44ffcf154c63fe204a7787b96a657 (diff) | |
am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '826f3647a4a44ffcf154c63fe204a7787b96a657':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions