diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-16 04:02:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-16 04:02:18 +0000 |
| commit | 054b5bbb2bd8d09dde5ce8f5a3335fde446e92fa (patch) | |
| tree | 298dcebf229b7d3a5284aee574a144ca11b4a4f0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eae61b82bdfd49ac09146b6069596ea5c864c3e0 (diff) | |
| parent | 0039271391089eeecb990ad0e66ba6e19f24eceb (diff) | |
am 00392713: (-s ours) am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '0039271391089eeecb990ad0e66ba6e19f24eceb':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions