Merge commit 'c804efe278fa33555e6e836504a467cb14505eb3' into eclair * commit 'c804efe278fa33555e6e836504a467cb14505eb3': Update 4.xml to the most recent APIs.
Merge commit 'c804efe278fa33555e6e836504a467cb14505eb3' into eclair * commit 'c804efe278fa33555e6e836504a467cb14505eb3': Update 4.xml to the most recent APIs.