OSDN Git Service

am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for...
authorAmith Yamasani <yamasani@google.com>
Tue, 23 Oct 2012 00:59:10 +0000 (17:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Oct 2012 00:59:10 +0000 (17:59 -0700)
commit4f5555ab9355e0b51a9858668aab8538e29d658c
tree29e97ad84ef1a2bec80532e9c26d7169bff20ed6
parent2d9629557dab78d174cbe1d6d392f7d1735ace25
parentb80b8bb2535504bada0664a7255b5fa61c2c3947
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