diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-10-01 16:16:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 16:16:17 -0700 |
| commit | 758e48f61f1a0f97ded70663b4b486bbe51985a9 (patch) | |
| tree | 4dc388bcf0e43c8e04a4dc12f512ffe19f0517ec /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 562108c8bff63b57f41a0dd353fe65b89e8a847a (diff) | |
| parent | 533ca9650a7e82f42fb64c8be62830d8d256543c (diff) | |
am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp
* commit '9430f9d37ec169ce0654bc8950adb66ac974b761':
KeyStore: Update the parameters of generating master keys.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions