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