OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 543189e a3a52a9)
am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscryp...
authorKenny Root <kroot@google.com>
Tue, 31 Mar 2015 19:22:17 +0000 (19:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Mar 2015 19:22:17 +0000 (19:22 +0000)
* commit 'a3a52a96543bd3874e23d90f91b5f4197eab98e5':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE


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