Amith Yamasani 1c2c48cba6 am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev ...

* commit 'f426ace9dab65c88b36a047bf921070edcf8cf61':
  Only wipe device if primary user (for failed password attempts)

2012-11-27 15:40:36 -08:00

..

com/android/server

am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev

2012-11-27 15:40:36 -08:00

Android.mk

Remove obsolete variables.

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