diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-22 14:01:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-22 14:01:43 +0000 |
| commit | 56c32d504e98e465cc7f3ff30ee42b14a67dddfb (patch) | |
| tree | a0c4d516b7dd6f80bfaaa50005003d907a907cbe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 76d2204d2b4d42f11222eb68f0058b6c3bae6e10 (diff) | |
| parent | 224083b8a12f00427194216c1d29f3744ee9d30d (diff) | |
am 224083b8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '224083b8a12f00427194216c1d29f3744ee9d30d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions