am bc5198b8: am 8822a52c: am 287c739d: Merge "Fix build"

* commit 'bc5198b8d1a5a92a541da9de528f61054988bfa3':
  Fix build
This commit is contained in:
Satoshi Kataoka 2013-10-09 21:25:55 -07:00 committed by Android Git Automerger
commit 1348564283

View file

@ -589,7 +589,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
// Needs to save pending updates for recent keys when we get out of the recents
// category because we don't want to move the recent emojis around while the user
// is in the recents category.
mEmojiKeyboardAdapter.flushPendingRecentKeys();
mEmojiPalettesAdapter.flushPendingRecentKeys();
}
mEmojiCategory.setCurrentCategoryId(categoryId);