tree 2900c8cb87756423e8ba966598e07f3169b88304
parent c72ac842d72c23b348e60327d635e59cb7ca53bf
parent f2a3c287cb178b01a61914dcc388ca58b6a77bfd
author Raymond Chiu <chiur@google.com> 1499899078 +0000
committer android-build-merger <android-build-merger@google.com> 1499899078 +0000

Merge "Make support-emoji dependency more robust" into oc-support-26.0-dev
am: f2a3c287cb

Change-Id: Ie68df48093ebf83df294a2c6e19b76d71cd1b1b6