am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread

* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
  docs: remove "new" tags from sample apps
This commit is contained in:
Scott Main 2010-11-10 14:55:48 -08:00 committed by Android Git Automerger
commit bbea7710b7

Diff Content Not Available