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:25:57 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 23:25:57 +0000 (23:25 +0000)
am: 584406f8e1

Change-Id: I42fad81d99eb8ed540ef24fae1b4e86402b33a82


Trivial merge