diff options
| author | Bill Yi <byi@google.com> | 2016-08-02 10:05:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-02 10:05:27 +0000 |
| commit | 01f73cce2d72550a8a7220a7cb1a1c89006772b1 (patch) | |
| tree | 8e3fd1e626f71710f587e42e5dbf6a72c632d4e4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 506b68bbad3949cd944db360029a39a345f1f3e5 (diff) | |
| parent | 0b18f2c06fb268b94051e3002cb09f4c3f913da7 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 0b18f2c06f -s ours
Change-Id: Iaca200f529c8d0bcd6eacd81604c4c5c470061f8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions