diff options
| author | Baligh Uddin <baligh@google.com> | 2015-01-06 22:36:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 22:36:10 +0000 |
| commit | 5e1b4a0c8301716bd20fa172db523013e7b698bd (patch) | |
| tree | 6e28d35dbd44464f3377f172f83ed25bb538e0af /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7aa9d752c8cb5cfb9eeeeec23f53d1ad8ea271c2 (diff) | |
| parent | efc0bbecc5dad6e1ac78b39b4f6f0c7f943d2b25 (diff) | |
am efc0bbec: (-s ours) am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'efc0bbecc5dad6e1ac78b39b4f6f0c7f943d2b25':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions