diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-01 07:37:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 07:37:12 -0700 |
| commit | c08ce101e0fc093d1e2e97359dda501cf37d4270 (patch) | |
| tree | 1665087a191f5aed6dcb4110b8b9bb48ec5854ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 154abe1e7b66b1a09d62beefe7aab95820f028d1 (diff) | |
| parent | 50bdac61a10c5d0296dc0de7ad6c7f4ed59186f6 (diff) | |
am 50bdac61: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '50bdac61a10c5d0296dc0de7ad6c7f4ed59186f6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions