| commit | 3bf2c59881ebdd4cf77099806d26f280046623bf | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Fri Oct 04 05:02:12 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 05:02:12 2013 -0700 |
| tree | 78055a11e3c015ba88706ae691d5c1783595282e | |
| parent | 664f11f2ffee2cfefe12a98bde79673abf909148 [diff] | |
| parent | 1d188a28fb0930217098fef10937674e24ca5a49 [diff] |
am 1d188a28: Merge "Fix emoji" * commit '1d188a28fb0930217098fef10937674e24ca5a49': Fix emoji