diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:43:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:43:16 +0000 |
| commit | 3772e27cb6ec797a1b79f5f93bbd6b72163d3671 (patch) | |
| tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0310775154f533d1b6b156ceabe610bd4c249d25 (diff) | |
| parent | 5e73ac027d795c0442c841e6081fc6f43c8d7390 (diff) | |
am 5e73ac02: (-s ours) am 305cf0f8: (-s ours) am 4d64bdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '5e73ac027d795c0442c841e6081fc6f43c8d7390':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions