Merge "Fix default network transition event recording" into nyc-dev

author Hugo Benichi <hugobenichi@google.com>

Wed, 25 May 2016 03:22:31 +0000 (03:22 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 25 May 2016 03:22:32 +0000 (03:22 +0000)
author Hugo Benichi <hugobenichi@google.com>
Wed, 25 May 2016 03:22:31 +0000 (03:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 25 May 2016 03:22:32 +0000 (03:22 +0000)
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
author	Hugo Benichi <hugobenichi@google.com>
	Wed, 25 May 2016 03:22:31 +0000 (03:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 25 May 2016 03:22:32 +0000 (03:22 +0000)