Jeff Hamilton e3db3d6209 Merge commit '525f953b' into manualmerge ...

Conflicts:
	api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7

2011-01-09 21:01:56 -06:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

…

7.xml

…

8.xml

Hide two audio focus methods.

2010-05-11 14:28:38 -07:00

9.xml

Fix up API definitions in master.

2010-12-05 13:26:04 -08:00

10.xml

Work on issue #3255640: Need to bump GB to API 10 version name "2.4"

2010-12-14 11:29:01 -08:00

11.xml

Add TextView support for Home, End, PageUp, PageDown.

2010-12-21 18:03:08 -08:00

current.xml

Merge commit '525f953b' into manualmerge

2011-01-09 21:01:56 -06:00