tree 5d44d167659a5a2210bb4e11f2f14ae49d9f277e
parent 2b133fc07533a853f7de23da4f60a766f4233bed
parent 20cb2310cffb787c54016d50b9b5fe320fc5b025
author Chia-chi Yeh <chiachi@android.com> 1285866676 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285866676 -0700

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

Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp

* commit '20cb2310cffb787c54016d50b9b5fe320fc5b025':
  KeyStore: Initialize IV correctly.