OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b62085 57ca15e)
am 57ca15e4: am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper...
authorPaul Lawrence <paullawrence@google.com>
Sat, 19 Sep 2015 02:49:00 +0000 (02:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 19 Sep 2015 02:49:00 +0000 (02:49 +0000)
* commit '57ca15e45e2bac389d77173084b91de2551dc407':
  Revert "Remove don't kill flag from CryptKeeper to stop logspam"


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