Jim Miller ca299c6fbd Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev ...

am: 254d9e4f41

* commit '254d9e4f410f63ed1ba3f917e207731c5d9d6538':
  Fix KeyguardManager.isSecure() to observe work profile

Change-Id: I92f1387372cd02790f10f2940fdeb97ec6ab4a8f

2016-05-12 00:38:38 +00:00

..

java/com/android/server

Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev

2016-05-12 00:38:38 +00:00

jni

Merge "Revert "TIF: add signal detection feature for HW inputs"" into nyc-dev

2016-05-04 17:33:54 +00:00

Android.mk

Merge "Move UidRange aidl declaration to system/netd" into nyc-dev

2016-04-19 19:19:43 +00:00