Merge "Be more civil in comments" am: 775f724bcc
authorPyry Haulos <phaulos@google.com>
Tue, 27 Sep 2016 00:32:52 +0000 (00:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Sep 2016 00:32:52 +0000 (00:32 +0000)
am: c678e93e1c

Change-Id: I9f2ad25ad523cead914617c07b1ac1b172031fe2


Trivial merge