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