am 56205fea: Merge change 23345 into donut

Merge commit '56205fea879543a50bb797016832416a8b48cabb' into eclair

* commit '56205fea879543a50bb797016832416a8b48cabb':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
tree: f47c585c457a7fed85f6a9d83c8d2b5de35ee9f1
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE