Merge "Fix idle timer rule leakage"

author Chiachang Wang <chiachangwang@google.com>

Mon, 1 Oct 2018 02:20:23 +0000 (02:20 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 1 Oct 2018 02:20:23 +0000 (02:20 +0000)
author Chiachang Wang <chiachangwang@google.com>
Mon, 1 Oct 2018 02:20:23 +0000 (02:20 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 1 Oct 2018 02:20:23 +0000 (02:20 +0000)
diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge
author	Chiachang Wang <chiachangwang@google.com>
	Mon, 1 Oct 2018 02:20:23 +0000 (02:20 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 1 Oct 2018 02:20:23 +0000 (02:20 +0000)