OSDN Git Service

[automerger skipped] Merge "Add static IpClient logging" am: 8285261133
authorErik Kline <ek@google.com>
Thu, 3 May 2018 12:15:34 +0000 (05:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 May 2018 12:15:34 +0000 (05:15 -0700)
commitb3272f94884335dce1c010bff20741f60253affd
tree3cbcc7edf0e88c956f70b7036f10596ea153499e
parentf2c7c9ddf59af464dcb3316680a3f88979483517
parentd81625a7a98591a1e9d86e1a74bfda9cbcc8f7ba
[automerger skipped] Merge "Add static IpClient logging" am: 8285261133
am: d81625a7a9  -s ours

Change-Id: If8e8dc57346e315462c4a6ff020f7dee16115d76