OSDN Git Service

Merge "Remove rifle (1F946) from emoji font." into nyc-dev
authorDoug Felt <dougfelt@google.com>
Tue, 10 May 2016 21:28:25 +0000 (21:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 21:28:25 +0000 (21:28 +0000)
am: 0a9c387847

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

Change-Id: I0489385d7e578715613be1a0b6e3c8e087cd9119


Trivial merge