tree c96bd2bfcd456f9cb7d6e97042e22a7b466ba3d9
parent a6b67aac2ffe453493448d53c07a0136d87c88b4
parent 02262d72f30ac4934729e2041eab358866ca9088
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579719908 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579719908 +0000

Merge "Rename REGISTRATION_ERROR protected broadcast" am: 21c2702069 am: 58edbce30e am: 02262d72f3

Change-Id: Id3a0e6d9e303db0e5f1b5843a8ce739b087adf73