Merge commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54' into eclair-mr2-plus-aosp * commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54': Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54' into eclair-mr2-plus-aosp * commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54': Fix test breakage in Zaku. Modification to PhoneNumberUtils included.