0562eac463
Merge commit '31a12429b77e87b5047589d251642b975ad35b9a' into eclair-plus-aosp * commit '31a12429b77e87b5047589d251642b975ad35b9a': fix bug 2134685: fix tests for PhoneNumberUtilsTest.