diff options
author | Baligh Uddin <baligh@google.com> | 2014-08-22 17:27:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 17:27:33 +0000 |
commit | 90a7cbba0e9b437d4dffc1e03b2d17669a31c1b1 (patch) | |
tree | 7a3d1e3c7423337cf311c0f3c25ac42b3847d3f8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c60170b96f6020f0bb501b57bd5890fbc7079ad3 (diff) | |
parent | d6c7fd28d0295dca2ed0bc92301a059a57386bd4 (diff) |
am d6c7fd28: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'd6c7fd28d0295dca2ed0bc92301a059a57386bd4':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions