commit | dee593ab480801b6edff418c33158c9fadb06cbf | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu Dec 08 00:43:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 00:43:27 2016 +0000 |
tree | 85f9e28cc17db8fee6b32b5d3d62fe738de151e5 | |
parent | 36ae71194f5f3b7f692e51783e4de63df0d9b12f [diff] | |
parent | 4bc6d41f10d4c31cc2bb6db7e1498a0a74edc31d [diff] |
Merge "Revert "Direct Reply: Add back emoji button" This reverts commit 713fed9226a411d1ba83f925c10bc56fec4f2b70." into nyc-mr2-dev am: 3e3bb0d08f am: 4bc6d41f10 Change-Id: I4951dd2f74d7d23b6b9bc4de7369dc745961174b