Erik Kline 3096bc6311 Merge changes I47ccfa99,I5db1de3e am: 08498c32f4 am: 03f3294103 ...

am: 805104f40f

Change-Id: Ic774b944238d6df07511df8e467d66cefcd4fa81

2018-01-11 12:52:19 +00:00

..

java

Merge changes I47ccfa99,I5db1de3e am: 08498c32f4 am: 03f3294103

2018-01-11 12:52:19 +00:00

jni

Merge "frameworks/base: use proper nativehelper headers"

2017-07-20 02:50:53 +00:00

res/raw

…

Android.mk

Flatten dependency hierarchy of legacy-android-test

2017-12-07 07:38:59 +00:00

AndroidManifest.xml

Unify permissions under UPDATE_DEVICE_STATS.

2017-07-17 16:10:55 -06:00

AndroidTest.xml

…

OWNERS

Extend connectivity OWNERS

2017-12-14 09:56:56 +09:00