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

Change-Id: Ie42bd577ea465b047bee4df2ec6d3f970bf4c267


Trivial merge