Jean-Baptiste Queru fae998c860 resolved conflicts for merge of 7c08b70c to master ...

Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088

2010-10-10 19:02:41 -07:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

…

7.xml

…

8.xml

…

9.xml

am 89b4cb1e: am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread

2010-09-12 18:16:22 -07:00

current.xml

resolved conflicts for merge of 7c08b70c to master

2010-10-10 19:02:41 -07:00