Dianne Hackborn 6b592723c9 resolved conflicts for merge of f51ded0f to master ...

Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2

2011-06-10 12:45:36 -07:00

..

1.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

2.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

3.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

4.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

5.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

6.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

7.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

8.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

9.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

10.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

11.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

12.xml

Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.

2011-04-08 16:21:34 -07:00

13.xml

Tracking merge of dalvik-dev to master

2011-05-27 01:21:50 -07:00

14.txt

Add SwitchPreference

2011-06-08 18:25:27 -07:00

current.txt

resolved conflicts for merge of f51ded0f to master

2011-06-10 12:45:36 -07:00