diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-20 17:10:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 17:10:42 +0000 |
| commit | e20593034560656de227b5c34026bd0340239a20 (patch) | |
| tree | 5fb285335d947d809bbc8143fee6b5c0afaebae0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 15f76355228b7aa1f48233f5aef8dccbf6fc82e7 (diff) | |
| parent | df808132d0233e259cae74ff3e9df6407f631321 (diff) | |
am df808132: (-s ours) am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'df808132d0233e259cae74ff3e9df6407f631321':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions