Merge "Fix typo in manual merge" into gingerbread-plus-aosp