am 921a3303: am 41732a32: am 8fd6c3d7: (-s ours) Stop being silly.
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 21:00:09 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:09 +0000 (21:00 +0000)
* commit '921a3303566b4ee99fce30700a113580bee7184b':
  Stop being silly.


Trivial merge