tree c7683665906fd9c838fb3e17f2539b14d10fce1b
parent d6ce12f504bfbb1dabf96a27a5897c19e9ecd526
parent f80646cb175e5aa2493c0e23b9045992c258d84c
author Chen Xu <fionaxu@google.com> 1564165363 -0700
committer android-build-merger <android-build-merger@google.com> 1564165363 -0700

Merge "cp sdk 28 carrier id list" am: 9cf12c4d7a am: 0d1c9d6223 am: 684de54c1f
am: f80646cb17

Change-Id: I079aabb4449d5425e56a9e4aea05260b1b80ede9