diff options
author | Baligh Uddin <baligh@google.com> | 2013-10-23 19:29:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-23 19:29:31 -0700 |
commit | 1f067222c66e00de5bf2f74b69033359d918c9ff (patch) | |
tree | c65a1c72ceabdf9e6cee07e41a634bd4aa50706e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 12583441fddf38a0769b08d5a187e5a2405cb531 (diff) | |
parent | ffbc7154dc2ee436c7b9efd9a26d0d77b3917c6a (diff) |
am ffbc7154: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ffbc7154dc2ee436c7b9efd9a26d0d77b3917c6a':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions