diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 17:55:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 17:55:29 +0000 |
| commit | 939423cb380344e41b422b1ed227541f2dee713f (patch) | |
| tree | 3261aea381da3a870a9801bfdc9f3e38b10b1acb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9793fa9254a2f13a8ec075e6ea53992e73c612aa (diff) | |
| parent | 9fd7ac26e3d87a1444a2bb8610fd001bd191e2fd (diff) | |
am 9fd7ac26: (-s ours) am ed133f9c: (-s ours) am b2323582: (-s ours) am 335ffd32: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '9fd7ac26e3d87a1444a2bb8610fd001bd191e2fd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions