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