OSDN Git Service

Merge "Fix NetworkScoreServiceTest.testSystemRunning." am: 5b4aec1dc6 am: 01828eb244
authorJeremy Joslin <jjoslin@google.com>
Wed, 4 Jan 2017 23:02:45 +0000 (23:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 23:02:45 +0000 (23:02 +0000)
am: b68823cab8

Change-Id: I19f5c7179a489e992356f141314582abc803ad2e


Trivial merge