OSDN Git Service

am b36291fb: am dd497cab: (-s ours) am 730c0f65: Merge "Fix stencil mask usage in...
authorChris Craik <ccraik@google.com>
Thu, 27 Aug 2015 19:03:42 +0000 (19:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:03:42 +0000 (19:03 +0000)
* commit 'b36291fbac4de8198a19f2000881c5a64ec4600e':


Trivial merge