OSDN Git Service

am 10680627: am a6869700: Merge "Fix tests after inet changes in NetworkController...
authorJason Monk <jmonk@google.com>
Fri, 12 Dec 2014 18:49:26 +0000 (18:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Dec 2014 18:49:26 +0000 (18:49 +0000)
* commit '106806270c6808c94978ce39e11b7ea73a2cfcf1':
  Fix tests after inet changes in NetworkController


Trivial merge