Fred Quintana 5bb9771ec7 resolved conflicts for merge of b8675943 to master

2009-11-24 11:39:32 -08:00

..

android

am 0182aa35: am 40c1dbf0: am a59a01ab: Merge change I43f72dd1 into eclair

2009-11-23 08:55:21 -08:00

google/android

moved the gdata library to vendor/google

2009-11-24 10:42:00 -08:00