Merge commit 'f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp * commit 'f7681f84918c27f6a626681ce37ed2a236c44e82': Do not merge.
Merge commit 'f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp * commit 'f7681f84918c27f6a626681ce37ed2a236c44e82': Do not merge.