OSDN Git Service

am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
authorLorenzo Colitti <lorenzo@google.com>
Tue, 28 Jul 2015 01:20:16 +0000 (01:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jul 2015 01:20:16 +0000 (01:20 +0000)
commit62ca62b32aae083c0f2d8b0bbec1fbd7d698f4ad
treec99f981e0ca6e1cf312e8810b03b5fa0f81c8eeb
parent7d07aff85e41a95ce4743d3b371935c9f21813ab
parente288b3af14421731d8f477b97e8d77588f20498b
am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev

* commit 'e288b3af14421731d8f477b97e8d77588f20498b':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
services/core/java/com/android/server/ConnectivityService.java