diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-04 21:45:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 21:45:42 +0000 |
| commit | 91b95c96127a85913854f2ad0a0ed0fad807c9a1 (patch) | |
| tree | 2553787d980c2e5a6efee30f3419a053245a2eb0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 180a30aa57e0790453944533dc442704f7596f65 (diff) | |
| parent | 5d1f68803488677637b1f383d0f1162a896a9684 (diff) | |
am 5d1f6880: (-s ours) am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '5d1f68803488677637b1f383d0f1162a896a9684':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions