commit | cf4884c5a79e9260a82e7d4ed0eac264f987c230 | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Fri May 23 16:44:50 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 23 16:44:50 2014 +0000 |
tree | 6843928b2e0ec6565d5e9ffa5da7c7532b990a2f | |
parent | c35706af3185863440102fa098d515026310a6a4 [diff] | |
parent | e3bfb825f558c6e46f75c11cbbe0b25ae36063ee [diff] |
am e3bfb825: Merge "Consolidate attributes to EmojiPaletteView to control indicators" * commit 'e3bfb825f558c6e46f75c11cbbe0b25ae36063ee': Consolidate attributes to EmojiPaletteView to control indicators