OSDN Git Service

am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into...
authorDianne Hackborn <hackbod@google.com>
Wed, 24 Oct 2012 17:59:40 +0000 (10:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Oct 2012 17:59:40 +0000 (10:59 -0700)
commita4dcf311c1955108e0b81e9dcd48723acde1acca
tree205a2c2f89bf33901f8a737902f03757498e4f55
parent40ca868a08e2c764a206a5e32b7e9af46fd168da
parent56e75631bd737e5362309330d4839cc1dddb501c
am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev

* commit '56e75631bd737e5362309330d4839cc1dddb501c':
  Fix issue #7342364: JellyBean broke Toddler Lock, again