OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df736de a7645df)
am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHER...
authorKenny Root <kroot@google.com>
Tue, 31 Mar 2015 16:46:39 +0000 (16:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Mar 2015 16:46:39 +0000 (16:46 +0000)
* commit 'a7645df5973cfb26aecabe093409e33eb745df17':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE


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