tree 065fedf4a6fd57837405a0014009401dfdf3217e
parent 4f40fb471265a164a0bdfd060d90375ce706b1dd
parent a68697005137c2b5c5feb43b8cac078f7b75ec18
author Jason Monk <jmonk@google.com> 1418409808 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418409808 +0000

am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev

* commit 'a68697005137c2b5c5feb43b8cac078f7b75ec18':
  Fix tests after inet changes in NetworkController