| commit | cda4e1baac4e944ab91dedfeab87007543fd0c5a | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Jun 08 14:44:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 14:44:37 2016 +0000 |
| tree | f01436ebbe1661e6595110e6ed67c2a653c837a0 | |
| parent | 85b415e1e8c25cf03b0cb6d768ca34a7c22f45c9 [diff] | |
| parent | 11716729a7e90710e29ee2bbb9f884917ee310cc [diff] |
Merge \"KeyDerivationFunction: example about treating data encrypted via SHA1PRNG\" into nyc-dev am: 11716729a7 Change-Id: I16ee07b32f7ccca8470fc938ad2b2f6442e7bcfe