OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76ba718 1c7f5bb)
Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager...
authorSharvil Nanavati <sharvil@google.com>
Fri, 25 Mar 2016 20:20:41 +0000 (20:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Mar 2016 20:20:41 +0000 (20:20 +0000)
am: 1c7f5bb  -s ours

* commit '1c7f5bb49c1918be446b967fd78b02313429322f':
  DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help