OSDN Git Service

am c42f3811: (-s ours) am 1bfb4e42: Create RenderScript ScriptC without resourceID.
authorMiao Wang <miaowang@google.com>
Thu, 27 Aug 2015 11:16:26 +0000 (11:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:16:26 +0000 (11:16 +0000)
* commit 'c42f3811ed137c424b088a83b064da5d179e0d13':


Trivial merge