diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-31 03:01:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 03:01:15 +0000 |
| commit | 8e717629958b0f18833fc0de07edca181a14419b (patch) | |
| tree | 51d942d62f771e0fa4d8a4d7f53c647d04fc29dc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a23894a2a110c6fdf88be151ae156abe2f431986 (diff) | |
| parent | 9bd5d8a6f9e22cc6d72c7ecdd281a1aa8deadf75 (diff) | |
am 9bd5d8a6: (-s ours) am 50265fc2: (-s ours) am 44718c4b: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '9bd5d8a6f9e22cc6d72c7ecdd281a1aa8deadf75':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions