tree fb97e5744f75087b93be0755c09f5f6977022a79
parent 2b614b6ea9e9a17033ce1e60efa24b14aa43abe1
parent 43f3f60ec01a1d658cbff9386a7fbf8a839894b9
author Mathew Inwood <mathewi@google.com> 1534463766 -0700
committer android-build-merger <android-build-merger@google.com> 1534463766 -0700

Merge "Code reformatting for upcoming automated code changes."
am: 43f3f60ec0

Change-Id: Id11efe22dffc7edd46d5dc2244b7121f664fba4d