OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5694ab 2cfedd9)
am 1b9c2108: Unhide new SSL APIs
authorKenny Root <kroot@google.com>
Tue, 6 May 2014 22:11:24 +0000 (22:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 May 2014 22:11:24 +0000 (22:11 +0000)
* commit '1b9c2108e8fdd5344e3916259f9d1eb3d2227a50':
  Unhide new SSL APIs

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help