diff options
| author | Baligh Uddin <baligh@google.com> | 2014-04-08 02:20:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-08 02:20:37 +0000 |
| commit | 56868fbcd9b086219c4350ac34b5dfdde127c5b9 (patch) | |
| tree | 153ee3ce06efcfb1f1e75cfa04d1016b39bd92cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a (diff) | |
| parent | 0cf836a77821afe8ff6cdfdaa3b55987cb6317da (diff) | |
am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions