am 382114ec: am e033c37e: am 12d9fbf8: Merge "Fix NPE in DialerDatabaseHelper for null phone numbers" into klp-dev

* commit '382114ec8fed1a32157a713360287b00987a41b4':
  Fix NPE in DialerDatabaseHelper for null phone numbers
tree: 595bc4feebf815e48680cf10778139e32d05be43
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags