OSDN Git Service

Merge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc3a -s...
authorLorenzo Colitti <lorenzo@google.com>
Tue, 9 May 2017 06:46:48 +0000 (06:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 May 2017 06:46:48 +0000 (06:46 +0000)
am: ea28d269ea  -s ours

Change-Id: I40b5bb1e640358e6889f92dacdd2a977bc9758fb


Trivial merge