commit | a77343f87372cd65e7872cdc2d6ce0b1ebb2572d | [log] [tgz] |
---|---|---|
author | Doug Felt <dougfelt@google.com> | Thu Jul 14 22:30:09 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 22:30:09 2016 +0000 |
tree | ba674f7a2d3887effe49efe17a32f78fd306cc7a | |
parent | 8d3090466bebca995f6ae31cef80530e229c3b57 [diff] | |
parent | 2f39bc777c22b5e4efb0f2764b0e35c66cdf6257 [diff] |
Merge \"Patch out part of the emoji tests.\" into nyc-mr1-dev am: 2f39bc777c Change-Id: I90c3528cf6d85929114af94feb0ef2f36954ca9f