Merge "Fix crash when number is null" into klp-dev
tree: e562f7d46bfe92af396adc728d682c79086bc629
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags