diff options
| author | Geoff Mendal <mendal@google.com> | 2015-05-04 15:05:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-04 15:05:16 +0000 |
| commit | f68020abf3a51ffefcf3cd8d2043684501b6f3ce (patch) | |
| tree | 9b72b84465aad221d2f101765082bd7b69c45567 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4aa8c7df2e09892c305cf9984ecf1916fa034e7f (diff) | |
| parent | ffdbf7da246ccc9fe9722c1e3fca84f97f96dd88 (diff) | |
am ffdbf7da: (-s ours) am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ffdbf7da246ccc9fe9722c1e3fca84f97f96dd88':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions