am ded9c531: Stop being silly.
authorElliott Hughes <enh@google.com>
Tue, 4 Aug 2015 07:05:55 +0000 (07:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 07:05:55 +0000 (07:05 +0000)
* commit 'ded9c531f51d4e7acfe47952f66836cf109ac395':
  Stop being silly.


Trivial merge