tree 3f55af5f53676ccce232271cfc27f8207385a32a
parent 81707aded67f456abdca72749f7d1b6f1ca959de
parent 4f254a7f7b47ef6edb1c361d160ad084695e0f1e
author weijiaxu <weijiaxu@google.com> 1519795069 +0000
committer android-build-merger <android-build-merger@google.com> 1519795069 +0000

Merge "set connection state after adding NonSimulatorConnectionListener and set connection to active at the end." am: ac3d0e58f1 am: 2b310bbf73
am: 4f254a7f7b

Change-Id: I6a1b25f72618d1b521e1044334e4d5ad1f9a45b0