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:11 +0000 (17:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Oct 2012 00:59:11 +0000 (17:59 -0700)
commit7ff9d5e100eb9a730c6f390eef04b6172e9d4288
tree29e97ad84ef1a2bec80532e9c26d7169bff20ed6
parent5fb549bf5f21cb240b4af35779e291d5d48f0109
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