am 41732a32: am 8fd6c3d7: (-s ours) Stop being silly.
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 14:46:58 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:58 +0000 (14:46 +0000)
* commit '41732a32234acf4ffe74ad5ad29e54712c35ed52':
  Stop being silly.


Trivial merge