1
1
Merge branch 'Emoji' of https://github.com/himanshuispresent/ots into Emoji

Conflicts:
	ots-common.gypi
	src/cbdt.cc
	src/cblc.cc