90b765807e
Merge commit '3559c14c9c056b51e0def93625987e0a42c618f7' into eclair-plus-aosp * commit '3559c14c9c056b51e0def93625987e0a42c618f7': Add Website.TYPE information.