diff options
author | Bill Yi <byi@google.com> | 2016-11-02 13:08:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-02 13:08:32 +0000 |
commit | c99051554615806d55d2bb06f2c512d465b54b35 (patch) | |
tree | 3831dabc02f4ecd778cf0526d8b57a676c3ce5c8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4c58e001a2cbfd97611d274b3e3eb2012f44f9ee (diff) | |
parent | 015687b0269d0a45ae205359ba71357e35fdb714 (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f750173bf1 -s ours
am: 015687b026 -s ours
Change-Id: Id92fa9ff612c16f45cd20978b53f81adf85ef6f1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions