tree bcb83452a2793eba57bf02b4642fdeea3ac1043e
parent 1eadfb82a2e40edc21342a01d9094a4f4969cc41
parent 0a9c387847db52dfcfbb134916f51211560a290c
author Doug Felt <dougfelt@google.com> 1462915710 +0000
committer android-build-merger <android-build-merger@google.com> 1462915710 +0000

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

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

Change-Id: Ic6c87fb2b3b84dbe01c9681a1af11ae57e39e6a2