am 2cfb275f: Merge "Remove private references to isUriNumber and getUsernameFromUriNumber"

* commit '2cfb275f9433e485e63caee6da546549f5e1baae':
  Remove private references to isUriNumber and getUsernameFromUriNumber
tree: c17f9386555c896e1c9ba00d446653928b7341f9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags