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

Change-Id: I908c0f27358ad101ef39e61675854d172a7c6f75


Trivial merge