OSDN Git Service

am 16f7c8b2: am d15c3bd8: Merge "Disable setOutline() functionality, pending full...
authorChris Craik <ccraik@google.com>
Mon, 14 Jul 2014 20:19:50 +0000 (20:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 20:19:50 +0000 (20:19 +0000)
* commit '16f7c8b212da235d107ae060998c58cbc3fad861':


Trivial merge