Amith Yamasani 0c81034cac am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev ...

* commit '731a5c1a29e5bdbf6e7e4bade9b80f7abe6ec37e':
  Fix parsing bug that affects reading back guest restrictions

2014-12-01 18:38:14 +00:00

..

java/com/android/server

am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev

2014-12-01 18:38:14 +00:00

jni

Show error dialogs over apps that dismiss keyguard

2014-11-11 16:22:56 -08:00

Android.mk

…