tree 992633a75ffae174712538f4445816d2285049d6
parent e3dd67eb8bb0fbf3963424f81f84d7f787f193f0
parent 6f68b4bf53b343047a6461a9967235125bf54313
author Hall Liu <hallliu@google.com> 1592002992 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592002992 +0000

Merge "Rename addServiceAnnouncement-related methods" am: 6f68b4bf53

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311925

Change-Id: I505ebfd17d8ae54b3e61b8fee45e531361953076