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

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