Ricky Wai 9f51924553 Merge "Hide notification before tie managed profile lock" into nyc-dev ...

am: fcc38e6c35

* commit 'fcc38e6c35be0dd68d722b7398cf2fb66c1c0d92':
  Hide notification before tie managed profile lock

Change-Id: I2e4153b22e67a50f237e29883d949b7b827f4ff8

2016-05-10 20:19:29 +00:00

..

java/com/android/server

Merge "Hide notification before tie managed profile lock" into nyc-dev

2016-05-10 20:19:29 +00:00

jni

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

2016-05-04 17:42:50 +00:00

Android.mk

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

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