Dianne Hackborn 8b4c4f09f6 Merge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist" into oc-dev ...

am: c3b938ca5e

Change-Id: I585bf57074064761c7d216f05be23d7f044208fa

2017-05-11 18:45:00 +00:00

..

java/com/android/server

Merge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist" into oc-dev

2017-05-11 18:45:00 +00:00

jni

Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev

2017-05-11 03:55:40 +00:00

Android.mk

Remove dependency on telephony-common from services/core

2017-05-05 18:11:11 -07:00