Merge "Be more civil in comments" am: 775f724bcc am: c678e93e1c am: a1669de8bd am...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:29:44 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:29:44 +0000 (18:29 +0000)
am: f4b3d48ba2

Change-Id: Ia2e6dfe96b3e9a702f9d1aba71132d60a4927810


Trivial merge