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