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)
* commit '8fd6c3d7cbe880be786211df6388501e59de8b8b':
  Stop being silly.


Trivial merge