diff options
author | Baligh Uddin <baligh@google.com> | 2014-08-22 18:36:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 18:36:19 +0000 |
commit | d12be991afdaa80a556273e5ad91db2a824002c8 (patch) | |
tree | 3a4805a28afafa201f3010487b49fa29ec5a6cd2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 33a062f209823a26fbc868801ba2250f331340f6 (diff) | |
parent | 21281ae6f101e73d0262a5a3a9490f7369736ffb (diff) |
am 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '21281ae6f101e73d0262a5a3a9490f7369736ffb':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions