Hugo Benichi ed1e91e4f4 Merge changes Id0d536ff,I4fcd0ad7 into oc-dev ...

am: 0e8090b10e

Change-Id: I0b432e9d7aa5654a0aeac1d3d0a09e624bcbc9bc

2017-04-14 04:32:17 +00:00

..

android/net

Move some NetworkStats tests to tests/net.

2017-04-13 02:38:11 +09:00

com/android

Merge changes Id0d536ff,I4fcd0ad7 into oc-dev

2017-04-14 04:32:17 +00:00