am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" into jb-mr2-dev

* commit 'dac80f633977308ec87cca1dea802e81d0fb75ad':
  add api level 18 to javadoc 'since' tags