tree 2778d9bd5611213f1634d66b5d98d105658feb60
parent 935136689de16f9b63b2d9503b10f6fa386b8115
parent 7575ec2240e90dcbe6341e3c32610dc267930993
author Hugo Benichi <hugobenichi@google.com> 1501894483 +0000
committer android-build-merger <android-build-merger@google.com> 1501894483 +0000

Merge "NetworkCapabilities: fix describeImmutableDifferences"
am: 7575ec2240

Change-Id: If38efacdeec8476880835657938e435f9b598525