| commit | 943cdf7e221b867978416024526fe851c248972d | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Mar 05 22:20:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 05 22:20:56 2014 +0000 |
| tree | f8d8be95267fa6cb2fe0c793634584bf35a0f86e | |
| parent | 674fd6c442cd3886b3ab12be1d36c5d05ef48cdb [diff] | |
| parent | 777b8a808ee76401429f7210ebb7194632040d45 [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