tree b52fee064913d2dbdd8a6fe46bb2541ebf7f6ced
parent be2b5dab8842056d2b8e1353a8b3466474c368a7
parent 4adb05b6b0cddd8a75bb73d10ffd691c7b7c3ddc
author Remi NGUYEN VAN <reminv@google.com> 1546927347 -0800
committer android-build-merger <android-build-merger@google.com> 1546927347 -0800

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

Change-Id: Ie3d6285fa7da96fee10028b38aa6c5a8d5c85c48