am 2ef7081b: am 6f92dbc4: Merge "fix sdk build breakage; remove invalid @note tag" into honeycomb

* commit '2ef7081bc744aad8d94a16d08452f455731f241a':
  fix sdk build breakage; remove invalid @note tag