diff options
| author | Felipe Leme <felipeal@google.com> | 2016-08-18 16:20:01 -0700 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2017-01-18 19:08:29 +0900 |
| commit | d445c5553805d7b519f128258c21e29ebfc6c17a (patch) | |
| tree | 87544305f21e0782d35d607430373d87ccf8b769 /tools/aapt2/diff/Diff.cpp | |
| parent | c97d8b7464f0c60165ac9abb6b35323583fad2b5 (diff) | |
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)
(cherry picked from commit e4c029918f32f9dacc7e6a1e8102b71f3ca1018c)
Change-Id: I93cdfc8753dcded141732c0587783d1fa2085f5a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions