Chavi Weingarten 3477c31485 Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev ...

am: c36b2f0490

Change-Id: If0b75ee69bdb7c1668e87d40cb0c1d7d72feff58

2017-08-04 20:40:12 +00:00

..

java/com/android/server

Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev

2017-08-04 20:40:12 +00:00

jni

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944

2017-08-02 15:30:37 +00:00

Android.mk

Reland "services.core: remove use of -static hidl java"

2017-08-02 18:50:08 +00:00