tree 164c655a6df695fdb1330be9dee07feab5fea927
parent 5207e1cff17530df336bbaf343ccc9c633fc1b65
parent d575d88d8e6c34f9665365318e741367d05cf819
author Adrian Roos <roosa@google.com> 1481156716 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481156721 +0000

Merge "Revert "Direct Reply: Add back emoji button" This reverts commit 713fed9226a411d1ba83f925c10bc56fec4f2b70." into nyc-mr2-dev