am 8fd6c3d7: (-s ours) Stop being silly.
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 10:46:03 +0000 (10:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:46:03 +0000 (10:46 +0000)
commit41732a32234acf4ffe74ad5ad29e54712c35ed52
tree24002cae96d2478d3b77fc893c656ebfacb48803
parentae5deafcc303dc62077dda391ad3b6fc14925aa1
parent8fd6c3d7cbe880be786211df6388501e59de8b8b
am 8fd6c3d7: (-s ours) Stop being silly.

* commit '8fd6c3d7cbe880be786211df6388501e59de8b8b':
  Stop being silly.