tree 9779095e5a603526d44704c559c820d3628c5ea8
parent 01c7a1e8c7c713fdf04942b94d4355c6afe51600
parent 65723a7ac5a5b057755968650c78435d85ee0b00
author Jim Guggemos <jimg@google.com> 1440650743 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440650743 +0000

am 65723a7a: (-s ours) am 781c5be7: Merge "New CTS test for ConnectivityManager.(un)registerNetworkCallback." into mnc-dev

* commit '65723a7ac5a5b057755968650c78435d85ee0b00':