tree 254010ace6fb0d5f24970aa1aad58cbfdc7d2e68
parent 116e619f278be762e747820aa53f7489817fc1b5
parent ff07ff8e255a1bc01f95b1c062129139c3b1106d
author Hugo Benichi <hugobenichi@google.com> 1501467557 +0000
committer android-build-merger <android-build-merger@google.com> 1501467557 +0000

Merge "Logging improvements when NetworkCapabilities change" am: f60a38e152 am: bdfb4ee19c am: 88a572da7d  -s ours am: 5946442f8e  -s ours
am: ff07ff8e25  -s ours

Change-Id: Ib20ff1f481753b97ad31e17907567f3c4ed12f6c