summaryrefslogtreecommitdiffstats
path: root/docs/html/training/animation
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2014-11-01 14:41:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-01 14:41:35 +0000
commit42340b9de03fb2b27a0f915d827d729bce7fcda7 (patch)
tree319fbc980cf889e76be95e5dd5cc76184821dfc7 /docs/html/training/animation
parent721b1d383f44caedcada436bed0db5e9d6b672e1 (diff)
parent2f1c76f074e2299b4d4327f160b5c83ed99e280a (diff)
downloadframeworks_base-42340b9de03fb2b27a0f915d827d729bce7fcda7.zip
frameworks_base-42340b9de03fb2b27a0f915d827d729bce7fcda7.tar.gz
frameworks_base-42340b9de03fb2b27a0f915d827d729bce7fcda7.tar.bz2
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
automerge: 2f1c76f * commit '2f1c76f074e2299b4d4327f160b5c83ed99e280a': Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
Diffstat (limited to 'docs/html/training/animation')
0 files changed, 0 insertions, 0 deletions