OSDN Git Service

Merge "Add OEM_PAID capability to system api" into pi-dev
authorPavel Maltsev <pavelm@google.com>
Fri, 30 Mar 2018 18:30:23 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 18:30:23 +0000 (18:30 +0000)
commit0230db03dfbd529d0faff21f04aa5cb81e7d8b06
tree862d097052bdb8b4a9e1e48d392dbb44ae3d3f0b
parent7121e04797329661971495fd241941b71f8c345b
parent8982a81f3c63a9e08c693e503d75db46ce9c19eb
Merge "Add OEM_PAID capability to system api" into pi-dev
am: 8982a81f3c

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