diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-02 22:27:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 22:27:06 +0000 |
| commit | e105a70ae1dcfdbca15e188f27d7d3a1bea788d2 (patch) | |
| tree | 2eb8a369daef9530430dfc8dbb55376eac0d8237 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eb6c6d634774d85eceac135a91fdeaf3a884152e (diff) | |
| parent | 261db4f3a8709a0773d0932dd1052f526e59da3c (diff) | |
am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '261db4f3a8709a0773d0932dd1052f526e59da3c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions