tree e55bf98762860cb205e142a53d1afa80b378148b
parent 7e358cb73c5e3a58f342b36222a9fd89e417807b
parent bbea7710b77974ea35b423f4db692dfe98731143
author Scott Main <smain@google.com> 1289430613 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1289430613 -0800

am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread

* commit 'd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2':
  docs: remove "new" tags from sample apps