tree 743ca79d89e8a905db233e01587e7bf5d4ee588a
parent c3b2d73c1c09155e99dffa024ee680000d203f4e
parent f93a422a30d08a3c4d124e95999fb046323db395
author Leland Miller <lelandmiller@google.com> 1549962459 -0800
committer android-build-merger <android-build-merger@google.com> 1549962459 -0800

Merge "Move RCS specific canonical address handling"
am: f93a422a30

Change-Id: Icb60640b3eec9318a2045c2e954ef20cd027f7a1