Jean-Baptiste Queru 09fa73b3c3 resolved conflicts for merge of 8928ef8b to master ...

Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e

2010-10-22 12:29:27 -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 8928ef8b to master

2010-10-22 12:29:27 -07:00