Jean-Baptiste Queru ff59a5a60f resolved conflicts for merge of 693e6555 to master ...

Change-Id: I968f5cf82764562ce5a0b61408b8d290d4027aac

2010-04-09 08:49:11 -07:00

..

board

Overwrite android-info instead of appending to it

2009-12-03 11:25:47 -08:00

product

resolved conflicts for merge of 693e6555 to master

2010-04-09 08:49:11 -07:00