tree 44f180d77891375d09e7ca824f52b6c9296abe6e
parent ee57097de9d5f01413b9376656e0925ca1d2f343
parent c922a838729122e01ebf9ca02ac09bf178e62a4c
author Remi NGUYEN VAN <reminv@google.com> 1546927970 -0800
committer android-build-merger <android-build-merger@google.com> 1546927970 -0800

Merge "Fix linter errors in IpServer and its dependencies" am: a9be76c393 am: 4adb05b6b0
am: c922a83872

Change-Id: I4724c27872dc11eb53ed4561743a648ef87bf434