am 5d2a7b26: am 7d51517c: Merge change I611c15cf into eclair-mr2

Merge commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef'

* commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef':
  Add DoCoMo vendor specific OMNA WSP content type number