John Wang f9ab96f9d3 Revert "Do not merge. Return null id for Non-phone device." ...

This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42

Change-Id: I68470e729d9304f1c27473a71334e1b0de99ff01

2011-06-29 15:36:35 -07:00

..

java

Revert "Do not merge. Return null id for Non-phone device."

2011-06-29 15:36:35 -07:00

mockril

…

tests

Use upper case country codes in Country.java

2011-06-27 15:20:46 -07:00