diff options
| author | Baligh Uddin <baligh@google.com> | 2012-10-31 16:27:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-31 16:27:36 -0700 |
| commit | 47f52d754a738d0231312bafe8eaa0da8d0b3cde (patch) | |
| tree | e8c7908764c4f706381ed2d9ffd90b5d4508844b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6697c682faf1d1b6eb2cde289ff4ac42eac04665 (diff) | |
| parent | a68aa4e34357eccd7af4d7e29e574b6bc9c61d66 (diff) | |
am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'a68aa4e34357eccd7af4d7e29e574b6bc9c61d66':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions