diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-02 22:19:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 22:19:58 +0000 |
| commit | 747249454ed12b4def32f82c461d5590bec2f2f8 (patch) | |
| tree | 5a02e8cf5240b5589754cd11ec8ef1e7c012d87c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3bcc97e7a1eab012d55fa85fa352a95f7c26f547 (diff) | |
| parent | fccaa58c5e254c9fdbf1e90ebfa0d0e27fc33585 (diff) | |
am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'fccaa58c5e254c9fdbf1e90ebfa0d0e27fc33585':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions