am 2e8400c2: merge in master-release history after reset to 1f2c8cd7c3

Browse Source

* commit '2e8400c21174af2955ca3e4cf7c8035d4a0830d7':
  Fix URI comparison
  Revert "email: add support for Server Name Indication (SNI)"

...

This commit is contained in:

The Android Automerger 2014-06-06 15:41:57 +00:00 committed by Android Git Automerger

parent cb0ed2fbae 2e8400c211

commit 8a44b92af3

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