tree 452cd0859cc2b38503939892c70bfbba900d76d3
parent fd7ccd4325d4215fa74d1dd593a69555475025d8
parent 1671761a015fdf144be60407809a7a805e55956a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579830138 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579830138 +0000

Merge "Switch out existing PhoneConstants" am: 322271ae59 am: 8f5e57e7c6 am: 1671761a01

Change-Id: If8e08d8f6d02540937919d3a36fa42d2d78726b8