| commit | f5152735b5e3fa53b91dc7781037e287096b53a4 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu May 29 16:12:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 29 16:12:24 2014 +0000 |
| tree | 8f4c79268b9096794b730f6253992a8a135e545e | |
| parent | 1811efdcc20a2ae307fdfa441e72e0423b4052bc [diff] | |
| parent | 575510c48f3cad55a4751db89dc44e330b0cc9df [diff] |
am 8a518d92: (-s ours) Merge "DO NOT MERGE: Hide crypto consts from docs" into lmp-preview-dev * commit '8a518d9233c4351e2b90252156bb5bc3a7a140e1': DO NOT MERGE: Hide crypto consts from docs