OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fb5162 4f5555a)
am 4f5555ab: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small...
authorAmith Yamasani <yamasani@google.com>
Tue, 23 Oct 2012 01:01:19 +0000 (18:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Oct 2012 01:01:19 +0000 (18:01 -0700)
* commit '4f5555ab9355e0b51a9858668aab8538e29d658c':
  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