diff options
| author | Baligh Uddin <baligh@google.com> | 2013-04-26 10:39:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 10:39:05 -0700 |
| commit | 0eb47f01421d3004e09ca60e7d8f535b3fc5eeff (patch) | |
| tree | a567f8cacad2bffdf264c0caea73c421def9a2e0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4f94fd2f9edbe2bc69e8c22b73a9529b49f7c836 (diff) | |
| parent | 3433b6ff3481d2364e8d727e70bb6fdbd3f139c0 (diff) | |
am 3433b6ff: am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '3433b6ff3481d2364e8d727e70bb6fdbd3f139c0':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions