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