OSDN Git Service

Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock...
authorAmith Yamasani <yamasani@google.com>
Tue, 23 Oct 2012 00:56:54 +0000 (17:56 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Oct 2012 00:56:54 +0000 (17:56 -0700)

Trivial merge