OSDN Git Service

resolved conflicts for merge of dbc4edcc to mnc-dr-dev
authorPaul Jensen <pauljensen@google.com>
Wed, 5 Aug 2015 11:07:24 +0000 (07:07 -0400)
committerPaul Jensen <pauljensen@google.com>
Wed, 5 Aug 2015 11:07:24 +0000 (07:07 -0400)
commit86e7d135acbdb0055de6a687817d44ac60603c9f
tree779b9f59252cf055c07e68e27ea86a1e520721c3
parent815a6b6bdf400413057c83fa0ee63db749785d85
parentdbc4edccfced5cb739bae75e8cd15cecc39cf16e
resolved conflicts for merge of dbc4edcc to mnc-dr-dev

Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
core/java/android/net/ConnectivityManager.java
core/java/android/net/NetworkCapabilities.java
core/java/android/net/NetworkRequest.java
services/core/java/com/android/server/ConnectivityService.java