tree 57032129409f386eaa881742073d8fb4315037fd
parent f0ea09120e77a3715cff1969c380662898494e53
parent 76aa0c5506c180025d4d480e2fca3c7ffc60fafc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580233487 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580233487 +0000

[automerger skipped] Merge "Update CellBroadcastIntents API" am: 6ec1a35516 am: 078f736139 am: 76aa0c5506 -s ours
am skip reason: Change-Id I33cdf12beee2dc57030c0c9b6268ca5d1a3a2228 with SHA-1 d05f41e9a9 is in history

Change-Id: Ib6261726119f6f86f63a38c381c59f0cd6f30be7