diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-26 19:43:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 19:43:00 +0000 |
| commit | ce171764a613b4a4ec8bff50a0af1d0294cd3da6 (patch) | |
| tree | b9631bbe2ad4bffe470ab9282644f5bccd2232c1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ebf862cc5a022716a208ba5ecfeb15eab8d0f81b (diff) | |
| parent | fe279813264a4bd35450fdd4839a4924276df480 (diff) | |
am fe279813: (-s ours) am 42acb728: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'fe279813264a4bd35450fdd4839a4924276df480':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions