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