The Android Open Source Project 575d1af980 resolved conflicts for merge of cf098294 to master

2009-07-03 08:55:59 -07:00

..

defaults.xml

resolved conflicts for merge of cf098294 to master

2009-07-03 08:55:59 -07:00

strings.xml

Squashed commit of the following:

2009-06-17 15:17:29 -07:00