Pavel Maltsev 5e5bc33153 Merge "Add OEM_PAID capability to system api" into pi-dev ...

am: 07019bb20f

Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa

2018-03-30 18:30:23 +00:00

..

java/android/net

Merge "Add OEM_PAID capability to system api" into pi-dev

2018-03-30 18:30:23 +00:00

jni

frameworks/base: use proper nativehelper headers

2017-07-19 10:06:40 -07:00