| commit | 56868dc42ecdf73ef27ba90ca7b80c47b669aeb5 | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Fri Apr 26 03:49:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 26 03:49:06 2013 -0700 |
| tree | f2aae988b754a8346238f8b1fb55960b8991360f | |
| parent | 79050aaee7a462980c1f0ae48e0149fd922c9350 [diff] | |
| parent | 14ab52d1659f0c77636e749e4541c8b5589ddf43 [diff] |
am 14ab52d1: am 2ef72311: Merge "Fix EmojiTest threading issue." into jb-mr2-dev * commit '14ab52d1659f0c77636e749e4541c8b5589ddf43': Fix EmojiTest threading issue.