diff options
| author | Baligh Uddin <baligh@google.com> | 2013-07-02 12:41:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-02 12:41:28 -0700 |
| commit | 53c8979f108e5a75e8fabbcc25b66b5d614eae92 (patch) | |
| tree | 513b0ec92852e6061d09af8447c70e5abe7e8e97 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 347403680e32af19df39839857205ff5eadbd3f4 (diff) | |
| parent | 2c975eda80983d4222770284433b44fae75a7f7c (diff) | |
am 2c975eda: (-s ours) am 24a12f67: am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '2c975eda80983d4222770284433b44fae75a7f7c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions