am d379946b: am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev

* commit 'd379946bca8dd7cf91707698aa15f2a8b5514d03':
This commit is contained in:
Amith Yamasani
2012-10-29 13:41:58 -07:00
committed by Android Git Automerger

Diff Content Not Available