diff options
author | Bill Yi <byi@google.com> | 2017-08-12 16:37:59 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-12 16:37:59 +0000 |
commit | e46269c61197bf861b7289d7bf642d11bbd5a02a (patch) | |
tree | b14e288806e0a42b04e1ad4735be34e94e969196 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f98d1516bc5d5a1679b57f50065c9b42d964fefa (diff) | |
parent | 37f09d5a4982ee83bbb9d8c1b74e11be3f361c19 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 37f09d5a49 -s ours
Change-Id: I8bea5934dda3f270ba76b37ebd8903c3a5fc1612
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions