diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 17:16:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 17:16:01 +0000 |
| commit | 30a7f56cfbb1d82b3c3269fee5f9e0bb8f5c3eb4 (patch) | |
| tree | 89cf233ca419e15e6f26bc4f8122631d2608a769 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c0c9b129440122b05a7245b6b624e83e9be2f93d (diff) | |
| parent | 7d447f734d334dfdd953fdcd45b38fabbeec58dc (diff) | |
am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '7d447f734d334dfdd953fdcd45b38fabbeec58dc':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions