OSDN Git Service

am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before...
authorPaul Lawrence <paullawrence@google.com>
Thu, 24 Jul 2014 23:36:02 +0000 (23:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 23:36:02 +0000 (23:36 +0000)
commita6ce40f461672fdbfef611bfcc90a7578b18b70c
treeeb64565b7559d1cc181c12678995938a2f19caed
parentc79ba3b870048e9e0fd57a232bf5de71615735cd
parent4ea43465fa12efbe064f24d583a39409caa3cf3d
am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev

* commit '4ea43465fa12efbe064f24d583a39409caa3cf3d':
  Show countdown of remaining decrypt attempts before wiping device