diff options
| author | Kevin Hufnagle <khufnagle@google.com> | 2016-05-27 03:45:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 03:45:52 +0000 |
| commit | 1b02f32a569b4c8bbb3dea759cdeda9a4a2316c5 (patch) | |
| tree | a45bced60343114e4eedab411e0635164319fa53 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b0f1031ae31e183fc0115998f267b6499eb6863c (diff) | |
| parent | 302e608b732057d93ca2fd5941723829af3a1804 (diff) | |
Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f
am: 302e608b73
* commit '302e608b732057d93ca2fd5941723829af3a1804':
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Change-Id: I3d547aa453a6d252d62e9851ee0f433b51873ff9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions