tree 76bbb5918dbb364915f7e3daaa8e71d15055cb07
parent 3f076da22ba5bf8bff457019714cf7aa683d9c79
parent 420eec4f5236be8b623d5bd7c64d890545d719e5
author Christian Wailes <chriswailes@google.com> 1548296605 -0800
committer android-build-merger <android-build-merger@google.com> 1548296605 -0800

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

Change-Id: If4634a4d8026c1df1c581b120527926fbee68a0e