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

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