summaryrefslogtreecommitdiff
path: root/libs/ui/KeyCharacterMap.cpp
diff options
context:
space:
mode:
author Kenny Root <kroot@google.com> 2010-10-15 14:00:58 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-15 14:00:58 -0700
commitd72b033033381c878322ff6761438d8d2d91b589 (patch)
tree6a16669985f87e691fc14c1d738095770ed57f02 /libs/ui/KeyCharacterMap.cpp
parent4a8ef924950df8269f0d2066187b4850d9cb98a9 (diff)
parentd47001fc34877da2414bd9d681b14484b7744f8a (diff)
am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84' * commit '8fda1636e3e35f060b9046294efd3c062a1fdb84': OBB: use PBKDF2 for key generation.
Diffstat (limited to 'libs/ui/KeyCharacterMap.cpp')
0 files changed, 0 insertions, 0 deletions