am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1

* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
  add comment to deprecated tag