Merge commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp * commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b': some changes due to an API review
Merge commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp * commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b': some changes due to an API review