am 62d35b65: resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

Browse Source

* commit '62d35b65f236e494520d7ca480e502c79f5f4fe3':
  Stop using apache-http in settings.

...

This commit is contained in:

Narayan Kamath

2014-12-15 19:02:26 +00:00

committed by Android Git Automerger

parent 1c09672629 62d35b65f2

commit 13df2564af

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available