tree d6e7aee4427a63c378aebcc6b951d772ad1f9f3b
parent fd1ad86dd7bc8692de0d98ea69d6de13d0d6d3ef
parent 4156442e49f3bb2aeaacc16d78764aff6d3fc99c
author Jim Guggemos <jimg@google.com> 1437053397 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437053397 +0000

am 4156442e: am 8cac2d90: Merge "New CTS test for ConnectivityManager.getActiveNetwork." into mnc-dev

* commit '4156442e49f3bb2aeaacc16d78764aff6d3fc99c':
  New CTS test for ConnectivityManager.getActiveNetwork.