Dirk Dougherty 8d79dc9350 resolve merge conflicts of c88afb6 to nyc-mr1-dev-plus-aosp ...

Change-Id: I4f9e194d2e07852799cafabae7289a61cae18bb3

2016-07-25 13:53:18 -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

Fix code tags that contain html encoded characters, and fix at links.

2016-07-22 18:29:36 -07:00

index.jd

…