OSDN Git Service

Merge "[automerger skipped] Merge "Add static IpClient logging" am: 8285261133 am...
authorErik Kline <ek@google.com>
Thu, 3 May 2018 12:31:28 +0000 (05:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 May 2018 12:31:28 +0000 (05:31 -0700)
commitac77b0d6c9e4a9179ea100663b4064222bdceace
treea87f44752db907438e7a731c3113eb50529bb863
parenta92c8ad1e14320ec62c757c2aecb4c4aaf9b50ab
parent3140998fedff0c86bf24261663fc3e3c4e114f32
Merge "[automerger skipped] Merge "Add static IpClient logging" am: 8285261133 am: d81625a7a9  -s ours" into pi-dev-plus-aosp
am: 3140998fed  -s ours

Change-Id: I88ce48c5842a6a3da50aa86341d21e4566194e2e