OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c79ba3b 4ea4346)
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)
* commit '4ea43465fa12efbe064f24d583a39409caa3cf3d':
  Show countdown of remaining decrypt attempts before wiping device


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