OSDN Git Service

am d379946b: am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enfor...
authorAmith Yamasani <yamasani@google.com>
Mon, 29 Oct 2012 20:41:58 +0000 (13:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Oct 2012 20:41:58 +0000 (13:41 -0700)
commit15d107441c05abc3e847fa0c270f2d6418f984e2
tree5ed2d5dbae30aa82d84acacdef3a6f8321d6e048
parent6de2c97369c9cdc4661ef3d5029689d63ad2b8c5
parentd379946bca8dd7cf91707698aa15f2a8b5514d03
am d379946b: am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev

* commit 'd379946bca8dd7cf91707698aa15f2a8b5514d03':