OSDN Git Service

Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s...
authorHugo Benichi <hugobenichi@google.com>
Fri, 20 Jan 2017 07:55:35 +0000 (07:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 07:55:35 +0000 (07:55 +0000)
am: feca77b884  -s ours

Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76


Trivial merge