OSDN Git Service

Merge "Skeleton of an IpManagerTest" am: db4333a2c2
authorErik Kline <ek@google.com>
Tue, 14 Mar 2017 03:19:56 +0000 (03:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Mar 2017 03:19:56 +0000 (03:19 +0000)
am: cf07e0d541

Change-Id: I9b0ed1aff8ba7d5465bff3d6fa8f9048153c8a44


Trivial merge