summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-16 09:07:56 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-16 09:07:56 -0700
commitd638d8d6305bf5861736045e0215099d2fb693f1 (patch)
treec8848a83f1609dc2aea8f827c1fe64a5a336ebca /core/java/android
parenta877427e2ffdb091801cd6803bb880104c753ef6 (diff)
parent653349fe48f2995d9e17b5e0a4110925cffdaeab (diff)
downloadframeworks_base-d638d8d6305bf5861736045e0215099d2fb693f1.zip
frameworks_base-d638d8d6305bf5861736045e0215099d2fb693f1.tar.gz
frameworks_base-d638d8d6305bf5861736045e0215099d2fb693f1.tar.bz2
am 653349fe: Merge change 4329 into donut
Merge commit '653349fe48f2995d9e17b5e0a4110925cffdaeab' * commit '653349fe48f2995d9e17b5e0a4110925cffdaeab': Change the first parameter of Keystore.generateKeyPair() to int.
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions