| commit | e55c4f43df68f8baf0d92273cc2eb9c3123bcdb5 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Sat Nov 01 17:40:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 01 17:40:58 2014 +0000 |
| tree | f95a5dac1edb607e73e51db5edd41df7d18313fb | |
| parent | 158183c79a5389c83d6f54896c31ecd46317eb0d [diff] | |
| parent | a409cdf161664666e15f337ea5a0efd078667352 [diff] |
am a409cdf1: am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f automerge: 42340b9 * commit 'a409cdf161664666e15f337ea5a0efd078667352': Mention ECDHE_PSK bug in Javadoc of PskKeyManager.