diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:05:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 23:05:04 +0000 |
| commit | df45d644b6fd4dda8d2e2b650ce262a2c5b3fe79 (patch) | |
| tree | ce7cec99f0dd32e67464e93a42927f9da159c155 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a01f5457bc819fcb48ba1bae1849f54138510ea7 (diff) | |
| parent | 5c7e4d99402bf0440ebd6713b6680f8abea175a3 (diff) | |
am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '5c7e4d99402bf0440ebd6713b6680f8abea175a3':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions