Joe Onorato 439d9a09f9 resolved conflicts for merge of a0eb715a to master ...

Change-Id: I6341ca672906de3c21800730ac28ba90ecab51ca

2010-10-11 17:12:46 -07:00

..

board

am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread

2010-09-15 12:56:42 -07:00

product

resolved conflicts for merge of a0eb715a to master

2010-10-11 17:12:46 -07:00