Skip to content
Commit e1f05398 authored by Wilson Wu's avatar Wilson Wu Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with... 

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance" am: d6239637 -s ours am: e4c0dbb8 am: d89656e3

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

Change-Id: I744e07a163b09a22ad2135362da1a4f3058f7e02
parents 66bad21b d89656e3
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