Commit 3d624736 authored May 10, 2016 by Android Build Merger (Role) Committed by Android (Google) Code Review May 10, 2016

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

Merge "Merge "Remove rifle (1F946) from emoji font." into nyc-dev am: 0a9c3878 am: f6858e5f" into nyc-mr1-dev-plus-aosp

There are no changes