tree d6fa9d36d4c134115f0e4bda7f9f68b5a1136f17
parent 0adef024b2555733c8fcb1da5cfb26c6850b41bb
parent f20b47880b30ed18037ced5db47fa6615900bb76
author Xia Wang <xiaw@google.com> 1272667901 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272667901 -0700

am 011056c2: am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken