tree d0a1dfa19deaf6eda289f608cde2b9ba59e3f5b4
parent 2a920636df501bf0ff85b7796ef2ee0cad23a6d9
parent 9f9704c21f66e9fb4a82e906657cd620cd5ac1f7
author Ben Murdoch <benm@google.com> 1366973095 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366973096 +0000

Merge "Fix EmojiTest threading issue." into jb-mr2-dev