Jean-Michel Trivi dc871fd870 resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp
Change-Id: Ifd5f88f75feeb2dad1131e6a262dff3b979bdf8d
2011-01-24 09:35:57 -08:00
..
2011-01-23 14:56:39 -08:00