diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-08 19:01:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 19:01:35 +0000 |
| commit | e618963b93c81694124d61eab6528cabf5edfdc8 (patch) | |
| tree | 93027125663ed47788145538e91d29728c2df315 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bf965352df56939979a175371adc032fb9e7f3f2 (diff) | |
| parent | 035e10f8f5d47d0c39d8582c079c490075a1d650 (diff) | |
am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '035e10f8f5d47d0c39d8582c079c490075a1d650':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions