diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-10-06 21:41:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-06 21:42:01 +0000 |
| commit | 59a9de047946afe7c74a3065c6706dbe12ede09a (patch) | |
| tree | ba643bedd3074815a0b8449572ff3e0ee83afce0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a6216703f0434ab1a743edb13f5af20670916a23 (diff) | |
| parent | 859d5217c0b182babb8938cfb2a23fcd9cfb1ae3 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f381889844 -s ours am: d8ae5393a8 -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions