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