diff options
| author | Baligh Uddin <baligh@google.com> | 2013-07-01 20:57:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-01 20:57:19 -0700 |
| commit | d34c92a61b34ea739d3b10f340eb0d6122a2afca (patch) | |
| tree | f61ca90ab92d27a5d8c97b7ce7ee4bbbb7f7dcf8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 87a345e993eeee78501038fc55db223c39aba56d (diff) | |
| parent | 14bca94708363f3a22d741aad9e63132e903397e (diff) | |
am 14bca947: (-s ours) am cdf5ecc8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '14bca94708363f3a22d741aad9e63132e903397e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions