From: Hugo Benichi <hugobenichi@google.com>
Date: Thu, 18 May 2017 03:36:50 +0000 (+0000)
Subject: Merge "Fix NetworkNotificationManagerTest" am: c13a80deee
X-Git-Tag: android-x86-9.0-r1~3069^2~4^2~75
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=31c566037b08c611dd809078df32b7a0bd93d53b;p=android-x86%2Fframeworks-base.git

Merge "Fix NetworkNotificationManagerTest" am: c13a80deee
am: 13f0d10115

Change-Id: Icf4e4e9c9dde7f6c8308adb79e3ca8b63d6f604b
---

31c566037b08c611dd809078df32b7a0bd93d53b