OSDN Git Service

Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
authorSundeep Ghuman <sghuman@google.com>
Wed, 7 Jun 2017 23:23:20 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 23:23:20 +0000 (23:23 +0000)
commit788b2b93643f5dab494f36c45182f62b4e010ee0
treed8c5fb91c12ff9ff078ddf584128ea9cb08a16cb
parentab67c300f3ff486500344ca5d3e9d0dc772f3bf1
parent584406f8e12a767b0e1fa43df02e21d2e6852c52
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am: 584406f8e1  -s ours

Change-Id: Ib9a20c7caf8a86a0611c9c91a4b0024686e3f5e9