OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0ca0de fbd8805)
am fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
authorKenny Root <kroot@google.com>
Wed, 18 Mar 2015 16:54:29 +0000 (16:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Mar 2015 16:54:29 +0000 (16:54 +0000)
* commit 'fbd8805cd783e34aebf521913aeab6cfd483b7b2':
  Track change to Conscrypt


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