OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13d8e41 9a7c1a3)
Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
authorKenny Root <kroot@google.com>
Tue, 31 Mar 2015 19:10:48 +0000 (19:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 31 Mar 2015 19:10:50 +0000 (19:10 +0000)

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