tree 82cf1774d1f41400de37f8b7294c363588e996f3
parent 77dc5c543fe2122a65ccf005d3684124c897c6e5
parent ea23bd89c96eb396ea523ee5f5bbff91750b4959
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582256484 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582256484 +0000

[automerger skipped] Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo" am: 8c238b7dca am: 1f9ebb1971 am: ea23bd89c9 -s ours
am skip reason: Change-Id I18f9745174762a52fc20bfc7273c6b3fd2118da5 with SHA-1 77dc5c543f is in history

Change-Id: I22c2aa2968f66664ed65e31506b55d238a39ea7b