Merge "Add null check to avoid crash when incoming beam of contact" am: 4ab03e1367 am: d863125dd0 am: db391c3381
am: 27e8675a92

Change-Id: I649ba5edf1454855fbcbe4aeb4d1d0cb0a236c64
tree: 4b3daff6ad79135e1f163b09f12ced464891f31a
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml