Dirk Dougherty 66641f8ec5 resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp ...

Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3

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

…