reconcile w/p4

[android-x86/packages-inputmethods-PinyinIME.git] / res / drawable / emotion_icon_12.png

diff --git a/PinyinIME/res/drawable/emotion_icon_12.png b/res/drawable/emotion_icon_12.png
similarity index 100%
rename from PinyinIME/res/drawable/emotion_icon_12.png
rename to res/drawable/emotion_icon_12.png