Chenbo Feng e2753dbabb Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev ...

am: 26339f2d77

Change-Id: I7ba2bb548300d511ce0b7205e1055554406582f8

2017-07-17 21:11:59 +00:00

..

hostside

Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev

2017-04-17 17:43:44 +00:00

net

Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev

2017-07-17 21:02:46 +00:00