Skip to content
Commit 1e8cbf57 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

[automerger skipped] Merge "getSimLocale should return locale rather than... 

[automerger skipped] Merge "getSimLocale should return locale rather than string tag" am: 7db49c55 am: 6841e3ce
am: 1d8be8bb -s ours
am skip reason: change_id I850108ce0905d16e538e46ccd4bbf92a2bcfba42 with SHA1 199041f5 is in history

Change-Id: If7830ca281936ced67399a26e3fdb76cc5c9aef8
parents 6a5cd884 1d8be8bb
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