diff options
| author | Bill Yi <byi@google.com> | 2016-05-31 05:05:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 05:05:07 +0000 |
| commit | 65b962db7cbcce1bf9bf6648bab75363086370a9 (patch) | |
| tree | d7f31fa72d5e6ecdb54af0228075f98b207c1ad3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3b67ce333ae836f187424c1a59e5560701d3a958 (diff) | |
| parent | 2bba2ebd09c755d2d788a991e8e52b5d8adc1a1c (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours am: f35dcdb530 -s ours
am: 2bba2ebd09 -s ours
* commit '2bba2ebd09c755d2d788a991e8e52b5d8adc1a1c':
Import translations. DO NOT MERGE
Change-Id: If27f0033072370b8c4d11a7840d323ee525ec046
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
