tree 086039bba7d391b2087726837f80bf77ae382387
parent 24bdb2b39c3f593ce92d963007e53bb57502341f
parent c88f7ced51a9841d6db88e36b91acc9bde47dfaa
author Sundeep Ghuman <sghuman@google.com> 1497620396 +0000
committer android-build-merger <android-build-merger@google.com> 1497620396 +0000

Merge "Revert "Update Status Bar with Badged Wifi Icons."" into oc-dr1-dev am: 66b1223415
am: c88f7ced51

Change-Id: Ica1247613e8c3156da9a10770786da70913a3a03