Merge "Fix whitespace issues" am: 09b0225a8a am: f8b6504bce
authorPyry Haulos <phaulos@google.com>
Wed, 22 Feb 2017 19:57:27 +0000 (19:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Feb 2017 19:57:27 +0000 (19:57 +0000)
am: 3ab3152bbc

Change-Id: Ifff1d6ffbdec302ad74705924897d7487d3783c8


Trivial merge