diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-11 08:23:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 08:23:31 -0700 |
| commit | d2f0d91b96b3bc7d5c067065dbf9c727df93b1e2 (patch) | |
| tree | 138ab9bd3eba468defaddcc1bbdeac97b8238ec6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 16212a971c170acd38f1b750dc7058a782d31cc9 (diff) | |
| parent | 2806e4be99bb6264092bb8cd8a3ce39250f51d51 (diff) | |
am 2806e4be: (-s ours) am 38de7ab4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2806e4be99bb6264092bb8cd8a3ce39250f51d51':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions