tree b2ca1b6b0c03fc3a3c0733ee021fbec869154240
parent 311469f6c65ac6dabfc4f848678dda776f46855b
parent e77fc97dc6438110fd5205db2b5c5b799014a0b9
author Daisuke Miyakawa <dmiyakawa@google.com> 1243425014 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243425014 -0700

am e77fc97d: Tiny fix in EmojiFactory.cpp This must be submitted with change 2432.

Merge commit 'e77fc97dc6438110fd5205db2b5c5b799014a0b9'

* commit 'e77fc97dc6438110fd5205db2b5c5b799014a0b9':
  Tiny fix in EmojiFactory.cpp