OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40ec92c 6491436)
am 64914364: resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp
authorKenny Root <kroot@google.com>
Tue, 30 Apr 2013 16:01:44 +0000 (09:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Apr 2013 16:01:44 +0000 (09:01 -0700)
* commit '649143648073116b2ffb6af412b41ecec5280f86':
  Track change to JSSE provider


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help