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