diff options
| author | Baligh Uddin <baligh@google.com> | 2013-07-02 12:36:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-02 12:36:43 -0700 |
| commit | 2c975eda80983d4222770284433b44fae75a7f7c (patch) | |
| tree | cfdbb151bdaaa374a9ee0dfe26605ab835b1e6e0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dae9aa3f3716e7f370ea0b5681d87a7297201b7f (diff) | |
| parent | 24a12f67ba534bf158ee85cc998c2afbdfc7948a (diff) | |
am 24a12f67: am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '24a12f67ba534bf158ee85cc998c2afbdfc7948a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions