diff options
| author | Baligh Uddin <baligh@google.com> | 2013-04-24 10:51:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-24 10:51:09 -0700 |
| commit | ce74a074bd608e7c9753ee287975a00afd4bde14 (patch) | |
| tree | ab83176f0537ffbbb503514452ef9542909b6dbf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0054b3222d96074d4a88dcf1b2f073afd30980d6 (diff) | |
| parent | e9ad98996e200dfb1d25842deda65c6225f21063 (diff) | |
am e9ad9899: am d9ecfa00: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit 'e9ad98996e200dfb1d25842deda65c6225f21063':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions