| commit | f12df9e4017e9064cd5fafb2784a5e4182c6735c | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Wed Oct 09 18:55:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 18:55:00 2013 -0700 |
| tree | 79535c2113d130c9b07d8af35cc35e066ca8454b | |
| parent | 383da922a64e33d72907ead6ac8771ad3b98856a [diff] | |
| parent | 3bf2c59881ebdd4cf77099806d26f280046623bf [diff] |
am 3bf2c598: am 1d188a28: Merge "Fix emoji" * commit '3bf2c59881ebdd4cf77099806d26f280046623bf': Fix emoji