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

[automerger skipped] Merge "Use flatten component name for Carrier Settings... 

[automerger skipped] Merge "Use flatten component name for Carrier Settings activity" am: 4ebb7cca am: ebf790fc
am: 371caede  -s ours

Change-Id: I4a8440705902f2e66fcfdd925d5f2b43e1f8de54
parents 8ee9d7d1 371caede
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