| commit | b80b8bb2535504bada0664a7255b5fa61c2c3947 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Mon Oct 22 17:56:54 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 22 17:56:54 2012 -0700 |
| tree | 29e97ad84ef1a2bec80532e9c26d7169bff20ed6 | |
| parent | a7acb166b282e3aa178eb1f6d1c8ece877d2c64d [diff] | |
| parent | 64516a191f03a777896798f79792d39cde9592d7 [diff] |
Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev