[automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours am: 522841a340 -s ours am: 841239c310 -s ours

am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387126

Change-Id: I381bc1b4bbab6cfb47f97c2e900ecf824ea0f8d4
This commit is contained in:
Bonian Chen
2020-08-05 07:11:36 +00:00
committed by Automerger Merge Worker

Diff Content Not Available