diff options
| author | Bill Yi <byi@google.com> | 2016-06-01 15:33:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 15:33:43 +0000 |
| commit | 652af4f8133741752ed3146b7408144b28c45eff (patch) | |
| tree | 074c46a2df891fd4260fcf8a720a9128810b99d9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e316fc0577a1a4f8cd08c50b5c2e56d866a13983 (diff) | |
| parent | a007e877f2ed32bd51d6c03e94e20eac94ef4081 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: a007e877f2 -s ours
* commit 'a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: I261c5b972c2cf481fcfd2cd69ae7b4803ca8fac1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions