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

Change-Id: I24973e3f6546a235c9af1ababf0925557477f6b9
tree: 845eb03a40493d9be0c28c66c24a4cfc5a746da4
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml