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

am: 3d624736c6

* commit '3d624736c67cb4a9fe314d2d8bd1add98fdfa467':

Change-Id: I0ed1fd9fc3c5e16b39dc6cd3d6402d8cadcee987
This commit is contained in:
Doug Felt
2016-05-10 21:40:47 +00:00
committed by android-build-merger

Diff Content Not Available