OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fb549b b80b8bb)
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)
* commit 'b80b8bb2535504bada0664a7255b5fa61c2c3947':
  Fixes an AIOOBE when device admin enforces a small timeout for screen lock


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help