Skip to content
Commit 3ed1c21f authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

[automerger skipped] Disable emoji compat initializer am: 8e3d5a10 -s ours 

am skip reason: Merged-In Ie5c6e8dbc69001478af78923b02bcca7777ed6b1 with SHA-1 41472029 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22994099



Change-Id: I8d0a4848a99d94dc78847a67337b21eb5b6a04cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e45bd05f 8e3d5a10
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment