commit c39ecf10e06a3f30867e170a70cae3fc9bbc7a93
author Paul Stewart <pstew@google.com> Mon Dec 19 08:45:32 2016 -0800
committer Hugo Benichi <hugobenichi@google.com> Tue Dec 20 12:31:49 2016 +0900
tree 100f6bfdc4e562568be3fe96f335f3c3df9686ce
parent 1360fb4b3b10dfd9c1d05eeb96bcb56ae1a3e97d

DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java

Commit fb2609d3eee1c7a4dda889c000f32183a044978a added a string
format which caused an exception.  On top of the fixes to this
from e1406167186c2cabe683b3c1511ad6733e9106c9, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW

(cherry picked from commit 835cb49639fc7cb75819564fa15f2f5a0bd5dee2)

Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36