OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdf9e48 98e9c74)
am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeepe...
authorPaul Lawrence <paullawrence@google.com>
Fri, 18 Sep 2015 14:49:49 +0000 (14:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Sep 2015 14:49:49 +0000 (14:49 +0000)
* commit '98e9c7472ccb8f45220f73bf1c693f681681c00a':
  Remove don't kill flag from CryptKeeper to stop logspam


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