diff options
| author | Bill Yi <byi@google.com> | 2016-05-31 05:11:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 05:11:43 +0000 |
| commit | ae1249a1ca932ab1dde60bb51c8c93da825c115d (patch) | |
| tree | d7f31fa72d5e6ecdb54af0228075f98b207c1ad3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8f8a67999329126536794c1b9a081a9c0f3ddcf1 (diff) | |
| parent | f82c5112d456318dd7cb6fbb814a84272c0fc1ad (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours am: fc22bd87ff -s ours
am: f82c5112d4 -s ours
* commit 'f82c5112d456318dd7cb6fbb814a84272c0fc1ad':
Change-Id: I29a6a5982af379c4818308f7136790a3963fa92f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions