tree 0b4f8a4bd9c4e26fc43434396e411127fd28ab16
parent 7f0df997fe0c44e74a38536bb0f5b414b7ebce92
parent b50470fcea5b6dffe6263bb651aa3a8c6496aae4
author Jim Guggemos <jimg@google.com> 1438213443 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438213443 +0000

am b50470fc: Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev

* commit 'b50470fcea5b6dffe6263bb651aa3a8c6496aae4':
  New tests for (un)registerNetworkCallback with PendingIntent.