OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c09672 62d35b6)
am 62d35b65: resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Mon, 15 Dec 2014 19:02:26 +0000 (19:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Dec 2014 19:02:26 +0000 (19:02 +0000)
* commit '62d35b65f236e494520d7ca480e502c79f5f4fe3':
  Stop using apache-http in settings.


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