Skip to content
Commit 1f9995f3 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

[automerger skipped] Merge "new SystemAPI to getSimLocale" am: 5cf41e47 am: 1b607c87 

am: 59691cc2 -s ours
am skip reason: change_id I8f78ba00abf0ef74bd2b2147755596edaee156cf with SHA1 108f948f is in history

Change-Id: I0e040ce7e13d67d8b805bc31988cf1ddb04abdfa
parents 5b8ef04f 59691cc2
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