Jean-Baptiste Queru 41e6e0c49f am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp ...

* commit 'c34188a95405526416325604386af4f48ba20918':
  Add the possibility to modify the View focus rect

2012-06-23 07:13:25 -07:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

…

7.xml

…

8.xml

…

9.xml

…

10.xml

…

11.xml

…

12.xml

…

13.xml

Format NaN and Infinity as Doclava expects.

2011-09-28 17:04:52 -04:00

14.txt

Hide quota APIs until finalized.

2011-10-06 10:50:09 -07:00

15.txt

Unhide Resources APIs for getting resources at specific densities.

2012-01-09 12:00:30 -08:00

16.txt

Merge "Deprecate DatabaseUtils.InsertHelper."

2012-06-22 15:34:33 -07:00

current.txt

am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp

2012-06-23 07:13:25 -07:00