diff options
| author | Bill Yi <byi@google.com> | 2016-06-01 15:49:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 15:49:29 +0000 |
| commit | d785db718c4adf21ba36e8d2ca6e1c60047e3d55 (patch) | |
| tree | ad8c0dacaef6fbd371ad603b8059a06dc758eb84 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5c7df93d1a648d26da61a8cc4dac6d6db270cf10 (diff) | |
| parent | ed0e749092e8d8303876738b159278c8f226fc55 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours
am: ed0e749092 -s ours
* commit 'ed0e749092e8d8303876738b159278c8f226fc55':
Change-Id: I71989db7e276e5e4f735725fbb250d6aea764b56
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions