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

Browse Source

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

...

This commit is contained in:

Scott Main 2010-11-10 15:10:13 -08:00 committed by Android Git Automerger

parent 7e358cb73c bbea7710b7

commit 5d9a8d6ecb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available