diff options
| author | Baligh Uddin <baligh@google.com> | 2016-06-08 13:35:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 13:35:01 +0000 |
| commit | 5a0972e811aa32278d025a8743955ecc046f327a (patch) | |
| tree | cd80ae297e9957c857aaa379424a6ec991931856 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 43587bd1d4cc1c3ffa8fdd11ebaaab770fc32e3e (diff) | |
| parent | 73cadc95998d40790dda93826ed3f69c621b65ad (diff) | |
Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 2d3c74a2fd -s ours am: 74323832de -s ours\" into nyc-mr1-dev-plus-aosp
am: 73cadc9599 -s ours
Change-Id: Ia932bdb0671cc74fc4478b7cc9304cc736c49150
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions