tree f03b21caa9837e088a2a1fa0f4adedd5dc24cab3
parent 8ee9d7d11d4fa28b39abbfd95d853d77222255ac
parent 371caedefabfeb27249ca61336082ec4bedb8774
author Pengquan Meng <mpq@google.com> 1542290838 -0800
committer android-build-merger <android-build-merger@google.com> 1542290838 -0800

[automerger skipped] Merge "Use flatten component name for Carrier Settings activity" am: 4ebb7ccadf am: ebf790fc0c
am: 371caedefa  -s ours

Change-Id: I4a8440705902f2e66fcfdd925d5f2b43e1f8de54