tree 5a1d0514140ef80d7efb26bbbf279b4eab8ca3af
parent 6c74c9699140c15a38c1e520463c118b2bd47bd0
parent a78a9af27067ec66663381d8c16bda2f42e843b7
author Hall Liu <hallliu@google.com> 1563328708 -0700
committer android-build-merger <android-build-merger@google.com> 1563328708 -0700

Merge "Add text to RTT setting when roaming" am: c7e4274759 am: 2ab4f3283f am: 17cfdf8b0b
am: a78a9af270

Change-Id: I46cd5e4dfec1976400fa39d39f69439d22492665