OSDN Git Service

Merge "Fix testRegisterUsageCallback" am: d0b9f983d6
authorRemi NGUYEN VAN <reminv@google.com>
Tue, 8 May 2018 09:13:00 +0000 (02:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 May 2018 09:13:00 +0000 (02:13 -0700)
commit6b8e9a06359788625b61349e377751a9f1001314
tree61acc406c461a212f42ffbf72bb02733ce8a4990
parent299eba7cefd6e4b3083c978c2b96938248308b00
parent66674ce8fb48f6318d0275b42e826d183428eced
Merge "Fix testRegisterUsageCallback" am: d0b9f983d6
am: 66674ce8fb

Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java