OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9fdeaa e36542f)
am e6078129: am d1c5208b: Merge "No need to explicitly enable TLS-PSK cipher suites...
authorAlex Klyubin <klyubin@google.com>
Wed, 16 Jul 2014 15:35:44 +0000 (15:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Jul 2014 15:35:44 +0000 (15:35 +0000)
* commit 'e607812949c4d2fb733b20a5a172a4b2e5bd227f':
  No need to explicitly enable TLS-PSK cipher suites.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help