tree 2f0066b895ef36fe536cb0bc5282821e8b736e7f
parent 7fec3b9e05ebdf676d8ae294b1aa84880d9a4dad
parent 1b3877a96567c4021223c7b7c62c11db60db47fd
author Hugo Benichi <hugobenichi@google.com> 1502084957 +0000
committer android-build-merger <android-build-merger@google.com> 1502084957 +0000

Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am: 1b3877a965  -s ours

Change-Id: I42723162b29e8a8c966201e1b4da811e2d266f00