diff options
| author | Baligh Uddin <baligh@google.com> | 2013-12-11 13:52:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-11 13:52:06 -0800 |
| commit | 5d819bef3f4bf97c87032cc403e859b1d0d6797a (patch) | |
| tree | 475e1410a34abbfd6520fb285ab2700eb2e2820c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6a8b169118e4c3df80a800f28f32ad9ec61260ce (diff) | |
| parent | 32aa82223a5e0e5475df81378d0e6715601b2cc2 (diff) | |
am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '32aa82223a5e0e5475df81378d0e6715601b2cc2':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions