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

* commit '5b7a1bd7906b24e92d61b967abe736cc3559bf08':
  add comment to deprecated tag