Merge "Fix whitespace issues" am: 09b0225a8a am: f8b6504bce am: 3ab3152bbc
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 20:59:14 +0000 (20:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:59:14 +0000 (20:59 +0000)
am: 3f62f8f60c

Change-Id: I4e6f7c4435affd90293fe32ad024b2d26d9a486a


Trivial merge