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

..

com/android/server

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

Android.mk

Remove obsolete variables.

2012-08-21 17:24:03 -07:00