tree 4c519c02c4bd4afdc8bb9c55fff33138457a06ba
parent 71c96c079f8ec391487ca59efb247b55c921d81a
parent 2035cec9bceedb13f81c3d50475d29f6501dcf92
author Tadashi G. Takaoka <takaoka@google.com> 1398993621 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1398993622 +0000

Merge "More meaningful Emoji descriptions"