tree d5ad138c514ba2aa6184c6f22a09a7f90da95d4d
parent 654198c768e1750fd6300b2b4f372a3a50408299
parent 8dfb91df6caf03d7869421c52f1f5b196a954a6b
author Hugo Benichi <hugobenichi@google.com> 1501895670 +0000
committer android-build-merger <android-build-merger@google.com> 1501895670 +0000

Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: f6346af47e
am: 8dfb91df6c

Change-Id: I533ef8fe369cec19d283ff2950314fce6e28cffd