OSDN Git Service

resolve merge conflicts of ed6625d to stage-aosp-master
authorDavid Gross <dgross@google.com>
Thu, 21 Jul 2016 18:43:15 +0000 (11:43 -0700)
committerDavid Gross <dgross@google.com>
Thu, 21 Jul 2016 18:43:15 +0000 (11:43 -0700)
commit95e42d97f4b5150db2dcf1c26b3b50e6e133d1e4
tree01784b7fc552ea36444ccdd9a2a4c27bd8cd8c80
parent8f7223e420785962487995baad89f654fa1cc8ce
parented6625d9074a1de1515c97faf201a91fbb3abb27
resolve merge conflicts of ed6625d to stage-aosp-master

Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8
docs/html/guide/topics/renderscript/compute.jd