OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a063a84 d6d0cd5)
am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password...
authorPaul Lawrence <paullawrence@google.com>
Wed, 13 Aug 2014 19:55:41 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Aug 2014 19:55:41 +0000 (19:55 +0000)
* commit 'd6d0cd53d00a84619f3f90761ee3907732fac898':
  Bring up factory reset UI when decryption fails but password is correct


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