Chong Zhang 8a688436ac DO NO MERGE -- Revert the following two commits as they're causing flickering am: 44bd57ee25 ...

am: 26509f52d3

Change-Id: Ib2bf3635fad139f4eddbe05a2961e639efa58652

2016-08-12 19:58:55 +00:00

..

java/com/android/server

DO NO MERGE -- Revert the following two commits as they're causing flickering am: 44bd57ee25

2016-08-12 19:58:55 +00:00

jni

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

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

Android.mk

…