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