OSDN Git Service

DO NOT MERGE Stricter NetworkNotificationManagerTest am: a865790a5b
authorHugo Benichi <hugobenichi@google.com>
Tue, 20 Dec 2016 06:57:09 +0000 (06:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 06:57:09 +0000 (06:57 +0000)
am: 2abde827c5  -s ours

Change-Id: I5146235a579a66e8101106f288624fa2c00c4d43


Trivial merge