tree 2c92cf4116fe1c7851d9f0b551a8e29a23f02f45
parent 5019e0b10f5bbaa769b1871100ac48bf6a797244
parent c6464fad2f1fedb89c89efe52b437285490d2618
author Hugo Benichi <hugobenichi@google.com> 1495075226 +0000
committer android-build-merger <android-build-merger@google.com> 1495075226 +0000

Merge "Move NetworkNotificationManagerTest to tests/net" am: c6464fad2f am: 9fdc903af7
am: 777bf77c2c  -s ours

Change-Id: I0f63e4f29228a404ec0dac3571b2474806e4c8d6