| commit | 4f5555ab9355e0b51a9858668aab8538e29d658c | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Mon Oct 22 17:59:10 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 22 17:59:10 2012 -0700 |
| tree | 29e97ad84ef1a2bec80532e9c26d7169bff20ed6 | |
| parent | 2d9629557dab78d174cbe1d6d392f7d1735ace25 [diff] | |
| parent | b80b8bb2535504bada0664a7255b5fa61c2c3947 [diff] |
am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev * commit 'b80b8bb2535504bada0664a7255b5fa61c2c3947': Fixes an AIOOBE when device admin enforces a small timeout for screen lock