OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bde3966 1abdd7c)
am 1abdd7c9: am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factor...
authorPaul Crowley <paulcrowley@google.com>
Tue, 25 Nov 2014 15:21:44 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Nov 2014 15:21:44 +0000 (15:21 +0000)
* commit '1abdd7c98137b9b1c4172f2247a2cae37117b262':
  Reduce number of attempts before factory reset to 30.


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