tree fdd2249b5503bef3ac73b88bfc30654779029132
parent 2e88d0c4bc22412645d115945683ae6d7d2a33e3
parent ab6327bc9ab70f3b4c1f509d038474982772207e
author Chia-chi Yeh <chiachi@android.com> 1285879015 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285879015 -0700

am ab6327bc: am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread

Merge commit 'ab6327bc9ab70f3b4c1f509d038474982772207e'

* commit 'ab6327bc9ab70f3b4c1f509d038474982772207e':
  KeyStore: Initialize IV correctly.