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)
commit921a3303566b4ee99fce30700a113580bee7184b
treeb52b7861d0b8df4140b55895a04ce5db643760ba
parent830c76c321f42dafdd2c61177bab3a7e921ae05d
parent41732a32234acf4ffe74ad5ad29e54712c35ed52
am 41732a32: am 8fd6c3d7: (-s ours) Stop being silly.

* commit '41732a32234acf4ffe74ad5ad29e54712c35ed52':
  Stop being silly.