diff options
| author | Baligh Uddin <baligh@google.com> | 2013-04-30 16:45:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 16:45:45 -0700 |
| commit | cb79506984e23e9d9fc0d45a034c9c19e8f5ca0a (patch) | |
| tree | 7c67ea2164900126922062065155cef5e0b661d2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b713a15f099bec6ce70c4e09d853ec2d8b085c0a (diff) | |
| parent | 5bf93be4f45d62e685d2d124fa105d7fe5e9ffd1 (diff) | |
am 5bf93be4: (-s ours) am f0e8c78a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '5bf93be4f45d62e685d2d124fa105d7fe5e9ffd1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions