diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 13:27:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 13:27:16 -0800 |
| commit | 8ecf2307acb8fbb9c9b6378fa7278e5316dc38b7 (patch) | |
| tree | 806c1d62abf844bf3758212737dfa300d193b335 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6574caab31861726a2ac2ac19575d0ed0514b5d3 (diff) | |
| parent | 584b1cc07324244e2b1c1f0013a8a67b4a87fa04 (diff) | |
am 584b1cc0: (-s ours) am 0bdaa9a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '584b1cc07324244e2b1c1f0013a8a67b4a87fa04':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions