tree 6fd18ea9e98425fee3bb33625a26637e0bd8876d
parent ec182d7d1b9541b0680195256f6a0e401426493c
parent 544bcbe78ec3f8452e6c1a7d0dbffd8f46dd2fd5
author Hugo Benichi <hugobenichi@google.com> 1495068494 +0000
committer android-build-merger <android-build-merger@google.com> 1495068494 +0000

Merge "Finish moving NetworkStats tests to tests/net" am: 1ae1b6b960 am: cd821b231a
am: 544bcbe78e

Change-Id: I5d9a01a5804a7cc6289253db09078ede00fc0dc5