OSDN Git Service

Merge changes I90c211dc,I4455f272 am: a0ff4efc8b am: 2c856480a0
authorHugo Benichi <hugobenichi@google.com>
Tue, 4 Jul 2017 09:49:06 +0000 (09:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 09:49:06 +0000 (09:49 +0000)
commitad0e98f88127fea95b7b8320164a4efcc412e282
tree2555faecac7d19b17003dcb8a5846be2662f9fcb
parent324dfc989f6502bab1c1a525a3d634f401464722
parentd0e5f1d28047b5852e7aaf9903cebf0e22f21823
Merge changes I90c211dc,I4455f272 am: a0ff4efc8b am: 2c856480a0
am: d0e5f1d280

Change-Id: Ia79936c51ec8236d5c92c19a8d2a3dff34f0e1a1
core/java/android/net/NetworkCapabilities.java