am 71ba7d34: (-s ours) am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1

Browse Source

* commit '71ba7d34bc1c900a872d5353e3f04c3751fa95f8':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.

...

This commit is contained in:

Andreas Huber 2011-03-22 11:42:51 -07:00 committed by Android Git Automerger

parent 667d4aaea4 1bc4e51040

commit 8ce16a978b

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

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

Diff Content Not Available