OSDN Git Service

am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost...
authorChad Brubaker <cbrubaker@google.com>
Thu, 13 Mar 2014 18:18:36 +0000 (18:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 18:18:36 +0000 (18:18 +0000)
commitf5729a6a1573ba27f69a5c5dc144be3f8f60b026
tree9b71774cdb5e5b65cba115601a032db10d9458ab
parent91726f4ea7b60025490209ccb2637d712e8d75fd
parent1011960c44a4f84d53d05199fe1ca09be9473822
am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev

* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
core/java/android/app/ContextImpl.java
core/java/android/net/ConnectivityManager.java
services/core/java/com/android/server/ConnectivityService.java