Jean-Baptiste Queru 6525fca692 resolved conflicts for merge of be50507b to gingerbread-plus-aosp
Change-Id: Iaa5fb62f7b82b488bca192e7f374c044c7e1e6a7
2010-08-17 09:01:26 -07:00
..
2009-08-07 16:37:21 -07:00
2010-07-13 17:04:57 -07:00