OSDN Git Service

am b3a1674a: (-s ours) am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a...
authorStephen Hines <srhines@google.com>
Thu, 27 Aug 2015 08:56:12 +0000 (08:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 08:56:12 +0000 (08:56 +0000)
* commit 'b3a1674a47f8671f0e35e63c8d2ba7b3b73abc59':


Trivial merge