tree 00c2d064b89ddf86066ca414ff7dd7d611e470fb
parent 92c35129ef3bb3833c4c4670f4b6ef1de3cbee6e
parent 0a9c387847db52dfcfbb134916f51211560a290c
author Doug Felt <dougfelt@google.com> 1462915705 +0000
committer android-build-merger <android-build-merger@google.com> 1462915705 +0000

Merge "Remove rifle (1F946) from emoji font." into nyc-dev
am: 0a9c387847

* commit '0a9c387847db52dfcfbb134916f51211560a290c':
  Remove rifle (1F946) from emoji font.

Change-Id: I0489385d7e578715613be1a0b6e3c8e087cd9119