diff options
| 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 |
| commit | fcab0f5502410b975afe045354bbae31ccba68a5 (patch) | |
| tree | 184b37e57a998580c15fdaa98d7d8bf0c9155a90 /include/utils/Singleton.h | |
| parent | 10aca41e51934822dc492cb69b69cef37f42ad42 (diff) | |
| parent | 8fda1636e3e35f060b9046294efd3c062a1fdb84 (diff) | |
| download | frameworks_base-fcab0f5502410b975afe045354bbae31ccba68a5.zip frameworks_base-fcab0f5502410b975afe045354bbae31ccba68a5.tar.gz frameworks_base-fcab0f5502410b975afe045354bbae31ccba68a5.tar.bz2 | |
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 'include/utils/Singleton.h')
0 files changed, 0 insertions, 0 deletions