tree 7862ae5c4eddc7ce492bfd1afd663e56ea5b7eb8
parent 835f5e41de491c9df1278ed4f7643b0efbf2f46d
parent 88a572da7d400d614f5420a7c7d9ed78f2928617
author Hugo Benichi <hugobenichi@google.com> 1501466832 +0000
committer android-build-merger <android-build-merger@google.com> 1501466832 +0000

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

Change-Id: I5f6e3a2109236f30d0e09bde8a2c63b32e62f772