tree 42dacceeceea739827a7eb0880b8e1c0b161f76e
parent 21e026bb7eb4fa9b37867599e23b4296073072b2
parent 01bb4064267d94ca49e8c4a4633a75c755286588
author Roozbeh Pournader <roozbeh@google.com> 1471645604 +0000
committer android-build-merger <android-build-merger@google.com> 1471645604 +0000

Merge "Check defaults for Android default-emoji characters [DO NOT MERGE]" into nyc-mr1-dev
am: 01bb406426

Change-Id: I8d1ff867915f8a86296f6605ce0b363916341583