tree 375b3cb6a87361d69c5a1f9ec6600a4b6a5c0b8d
parent 4127448aa7d8e7ed387df57122fa349538900462
parent e7374ba2c7dae1c535975238d0ff42845df65084
author Chienyuan <chienyuanhuang@google.com> 1537334412 -0700
committer android-build-merger <android-build-merger@google.com> 1537334412 -0700

Merge "Simplify logic for connect in MapClientProfile" am: 0ac2a840a0
am: e7374ba2c7

Change-Id: I1b45c319378904de15b82e28ed2340df79de11d1