| commit | 14ab52d1659f0c77636e749e4541c8b5589ddf43 | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Fri Apr 26 03:47:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 26 03:47:01 2013 -0700 |
| tree | 5221c085cabb9b5293799455919df5abbee3678f | |
| parent | cb9e6bb35f3957168fa4a7c38352cd6dfb4b2816 [diff] | |
| parent | 2ef72311a4bc3edfe7fe254426732d68223bfa18 [diff] |
am 2ef72311: Merge "Fix EmojiTest threading issue." into jb-mr2-dev * commit '2ef72311a4bc3edfe7fe254426732d68223bfa18': Fix EmojiTest threading issue.