diff options
author | Bill Yi <byi@google.com> | 2016-10-20 16:10:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-20 16:10:05 +0000 |
commit | cbe06ade4a3c8572d95fddc8c318eccb055fc66a (patch) | |
tree | 7a5b558f2973172d9a4efe68cef72a502b9dc4ec /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e92a8e80c8efd3d5d0f5a084f7a3733e89778e08 (diff) | |
parent | 4df6ac860ea01a7f43a9f7b6eb647a6cc10b7fac (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f7a7712d50 -s ours
am: 4df6ac860e -s ours
Change-Id: I8d43798266a46cfe198314e80af52042fe4c1ade
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions