Amith Yamasani 58b4cc4d22 am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev ...

* commit 'dcf5a663cdec5ed1aa6b5d583cdac177a0974fcb':
  Read in the disable-keyguard-features flag from the XML file

2012-10-04 11:58:11 -07:00

..

common_time

…

input

New internal API to eliminate poke locks.

2012-10-01 14:27:34 -07:00

java

am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev

2012-10-04 11:58:11 -07:00

jni

Merge "Pass display arg to blank/unblank" into jb-mr1-dev

2012-09-28 13:06:45 -07:00

tests/servicestests

am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev

2012-09-27 19:34:28 -07:00