diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-03 11:02:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 11:02:40 +0000 |
commit | 892160a1c53265207878c199f0dbdc7a524979d3 (patch) | |
tree | 8d5310b1da89a5fa92ce081e6cef6811755f7129 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0ba5990d99fe96e5c6c1b864c4a23899be8b258a (diff) | |
parent | 45267b2f068fda88741ec5f9d949b6b19d232ed3 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 45267b2f06 -s ours
* commit '45267b2f068fda88741ec5f9d949b6b19d232ed3':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions