summaryrefslogtreecommitdiff
path: root/libs/ui/KeyCharacterMap.cpp
diff options
context:
space:
mode:
author Kenny Root <kroot@google.com> 2010-10-13 22:54:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-13 22:54:10 -0700
commit8fda1636e3e35f060b9046294efd3c062a1fdb84 (patch)
tree9c5d4cb8df12357a067f5214eb2f3dbd08d252ca /libs/ui/KeyCharacterMap.cpp
parente3c50a5470f64fd99438d6fd985f88d9fe20919a (diff)
parentbdf8034c657147226b2390eef113ff841e0d6065 (diff)
am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp * commit 'bdf8034c657147226b2390eef113ff841e0d6065': OBB: use PBKDF2 for key generation.
Diffstat (limited to 'libs/ui/KeyCharacterMap.cpp')
0 files changed, 0 insertions, 0 deletions