OSDN Git Service

Merge "Fix NetworkStatsAccessTest" am: ec1f25a4ba
authorHugo Benichi <hugobenichi@google.com>
Tue, 23 May 2017 06:56:48 +0000 (06:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 06:56:48 +0000 (06:56 +0000)
am: cdb75d321b

Change-Id: I5ef9861438bbe474b4e4670b8fdba4368531978d


Trivial merge