OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 562108c 533ca96)
am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into...
authorChia-chi Yeh <chiachi@android.com>
Fri, 1 Oct 2010 23:16:17 +0000 (16:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Oct 2010 23:16:17 +0000 (16:16 -0700)
Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp

* commit '9430f9d37ec169ce0654bc8950adb66ac974b761':
  KeyStore: Update the parameters of generating master keys.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help