Junyu Lai 59cc58b295 Merge "Move the test of minimum supported keepalive slots to CTS" am: c961e03526 ...

am: 6ff00fee75

Change-Id: Ib9b06d3458782a648a2f5b8fd5a9ca1d34bd11f9

2019-06-19 07:29:11 -07:00

..

android

Merge "Move the test of minimum supported keepalive slots to CTS" am: c961e03526

2019-06-19 07:29:11 -07:00

com/android

Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: 2ce04660f6

2019-06-17 10:33:53 -07:00