tree 4f559f07eff6f53d48f4c40c3ebb2a68488abe9b
parent d31401f6ced68a2c50ea5f13905a43aff0b7d396
parent 63e0819504ff1098289c818b700b716d11106f32
author Yabin Cui <yabinc@google.com> 1461034676 +0000
committer android-build-merger <android-build-merger@google.com> 1461034676 +0000

Merge "Fix kick_transport test." am: 63e0819
am: 119ca23

* commit '119ca2345d97db04d4114f5031d172f3694350d4':
  Fix kick_transport test.

Change-Id: I4625174a1d62edfa8a1db52ced70356798d53c95