Jorim Jaggi 526694ea52 resolve merge conflicts of 3c1b0f0 to master ...

Change-Id: I2314728cba47c28ff580f4dfc69868f8cb5ff5db

2016-08-03 16:23:28 +00:00

..

java/com/android/server

resolve merge conflicts of 3c1b0f0 to master

2016-08-03 16:23:28 +00:00

jni

Merge \"Remove dependency on android_alarm.h.\"

2016-07-20 18:10:47 +00:00

Android.mk

…