tree 6330eed1d74fdd069b6c06568fe3e325fdfdcee7
parent 698c84738e8b345d9b6b1eb3fab5266f06c3d8d0
parent 84913b808fca3e39ec802f35da7c698653e66ac8
author Jordan Liu <jminjie@google.com> 1573062600 -0800
committer android-build-merger <android-build-merger@google.com> 1573062600 -0800

Merge "Add CDMA SCP message handling to CellBroadcast module" am: f0e75a656c
am: 84913b808f

Change-Id: Icfc20849b7d52a4acf16150512b26dfe1e1b11fc