diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-11-01 15:00:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-01 15:00:10 +0000 |
| commit | a409cdf161664666e15f337ea5a0efd078667352 (patch) | |
| tree | b7bf62c431553929c60ed749c2abd248325b3170 /docs/html/training/animation | |
| parent | fd8184e4247f81f6027ae3cc328e8a19869c2d5e (diff) | |
| parent | 42340b9de03fb2b27a0f915d827d729bce7fcda7 (diff) | |
| download | frameworks_base-a409cdf161664666e15f337ea5a0efd078667352.zip frameworks_base-a409cdf161664666e15f337ea5a0efd078667352.tar.gz frameworks_base-a409cdf161664666e15f337ea5a0efd078667352.tar.bz2 | |
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f
automerge: 42340b9
* commit '42340b9de03fb2b27a0f915d827d729bce7fcda7':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
Diffstat (limited to 'docs/html/training/animation')
0 files changed, 0 insertions, 0 deletions