tree c9653faf346451bd79cc33976ab6e9e5e157c6c3
parent b3fb26272cb762755c89d417588e92da51561769
parent 228bf4f32036e7d9af3c80fd4b4c997688fc1e6f
author Siyamed Sinir <siyamed@google.com> 1532133114 -0700
committer android-build-merger <android-build-merger@google.com> 1532133114 -0700

Merge "Remove requirement for kiss emoji should have gender" into pi-dev
am: 228bf4f320

Change-Id: I9168be274a5ced20d8ddbf1ef6475dfec82262ef