tree fa450c411092fc71291cf16b394b348189d15bfa
parent 6ca10930b1ab74aa1273eda2f0ab5b71f4477813
parent 02a71e6eebcaf58bdbe4966fc315054d97ad7750
author Eric Schmidt <erschmid@google.com> 1463107761 +0000
committer android-build-merger <android-build-merger@google.com> 1463107761 +0000

Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs am: 16d7c71365 am: fd9dca7783
am: 02a71e6eeb

* commit '02a71e6eebcaf58bdbe4966fc315054d97ad7750':
  docs: Continue CL of emoji section in api-overview

Change-Id: Iee5bcf4a7f12e4ea46e052fb0ab7c3bb9e7371ca