David Gross 95e42d97f4 resolve merge conflicts of ed6625d to stage-aosp-master ...

Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8

2016-07-21 11:43:15 -07:00

..

reference

Fix typo in Conversion Functions doc

2016-03-30 10:02:29 -07:00

advanced.jd

Update RenderScript docs: reduction, other API 23/24 changes, cleanup.

2016-07-20 16:04:35 -07:00

compute.jd

resolve merge conflicts of ed6625d to stage-aosp-master

2016-07-21 11:43:15 -07:00

index.jd

…