tree 45ac403c1fcf13cdd6ab1544888ef53366674257
parent c5cc5e525cc52c9d46fac953a49d7e4afbb9ed38
parent f5ff8f0661d0c5150edac4e1b5100bf0b1db5b61
author Christian Wailes <chriswailes@google.com> 1548294144 -0800
committer android-build-merger <android-build-merger@google.com> 1548294144 -0800

Merge "Code cleanup to conform to style guide / linter."
am: f5ff8f0661

Change-Id: If6c04c711b328c114d04ea8b4aa01414a715b7a2