diff options
| author | Christopher Tate <ctate@google.com> | 2014-03-05 22:20:56 +0000 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2014-03-05 16:17:34 -0800 |
| commit | ff8b037c10a7ce90cbb6130b49c8cb076e1e7c0f (patch) | |
| tree | 3fad37a57528bf2fcf29aef1319e368c587559d4 /docs/html/sdk/api_diff/19/changes | |
| parent | 2665f6e9f5163d27608c21ed029a224d53ede43d (diff) | |
am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev
* commit '777b8a808ee76401429f7210ebb7194632040d45':
Adapt to underlying changes in the PBKDF2 implementation
Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257
Diffstat (limited to 'docs/html/sdk/api_diff/19/changes')
0 files changed, 0 insertions, 0 deletions