commit e4c029918f32f9dacc7e6a1e8102b71f3ca1018c
author Felipe Leme <felipeal@google.com> Thu Aug 18 16:20:01 2016 -0700
committer Lorenzo Colitti <lorenzo@google.com> Fri Dec 09 13:59:14 2016 +0900
tree f286cb42bb367d24cfb69b7e6a1d4d5d97d19857
parent 2026ca147b6460807b19c997600315806ecb3197

DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.

Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

BUG: 30943463

(cherry picked from commit b8f946dc4b24998f14e28573e452ab13ed533347)

Change-Id: Ia9929295ab2396a7ebb133e65d157f98414e4dfa