diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-04 15:16:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 15:16:10 +0000 |
| commit | 5d1f68803488677637b1f383d0f1162a896a9684 (patch) | |
| tree | 3c21408034e9bffdea00cde683c1b09be9a7831d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 95b5ca9019720c4c012ca13791d32aa6d0bb5ba8 (diff) | |
| parent | 72a204199510afdeb9cec483b4113433fe61089e (diff) | |
am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '72a204199510afdeb9cec483b4113433fe61089e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions