tree f4a0ca33ab5a1df1b6dd5ade7d735c318de594c9
parent 0d731c79e39590052ff3b95bac2151bb4fe19b68
parent f6346af47edbbfda4731bb7c1cba3aac85a86149
author Hugo Benichi <hugobenichi@google.com> 1501894864 +0000
committer android-build-merger <android-build-merger@google.com> 1501894864 +0000

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

Change-Id: Ieccad46fcffcaf748f5644b04617e9a82527000e