OSDN Git Service

DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
authorHugo Benichi <hugobenichi@google.com>
Fri, 9 Dec 2016 09:28:32 +0000 (09:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 09:28:32 +0000 (09:28 +0000)
am: cbf8ff83a8  -s ours

Change-Id: I6af5dd9e2bf31346578d5fca4a635ba3af2f2099


Trivial merge