Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp * commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64': DO NOT MERGE
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp * commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64': DO NOT MERGE