am 450ff8a4: Merge change 23357 into eclair
am 450ff8a4: Merge change 23357 into eclair

Merge commit '450ff8a48c9b78729332c99d680560b583f17e7d' into eclair-plus-aosp

* commit '450ff8a48c9b78729332c99d680560b583f17e7d':
  Fix double-free problem in EmojiFactory.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base