| commit | ca81fa06f55508217992247d758dd0bb04b7a8b9 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Thu Jul 12 17:14:58 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 12 17:14:58 2018 -0700 |
| tree | 54e88c99c64aa8b15df4ad9dcbb8db6ba49b0603 | |
| parent | a82d472568ab4db4f60a894261f850ddd1302eb8 [diff] | |
| parent | 68a449ab9b0a23ea35a90d7d62552fe748ad061b [diff] |
Merge "Upstream internal changes to emoji-compat from internal master." am: 68a449ab9b Change-Id: I6e0d9b14d21cf8d50f4b00d569c4e046045ce51a