6db0ef09c4
Merge commit '24c737ccdd64475178d53677f90a300fcfbab79f' into gingerbread-plus-aosp * commit '24c737ccdd64475178d53677f90a300fcfbab79f': Verify hostname where possible, and clarify where not.