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