OSDN Git Service

Merge "Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 7 Jun 2017 23:35:08 +0000 (23:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Jun 2017 23:35:15 +0000 (23:35 +0000)

Trivial merge