OSDN Git Service

Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1
authorSundeep Ghuman <sghuman@google.com>
Wed, 7 Jun 2017 23:31:52 +0000 (23:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 23:31:52 +0000 (23:31 +0000)
commitc633a31fda5429a180d8300d66317b7c733668ff
tree4b4ca16006943606c69f7bdb5a898bfcccc2c689
parent383cc530492e18f5afec934fdaf193b75c691973
parent8695bda38ec52fca025f374abc90ff66f720286c
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1
am: 8695bda38e  -s ours

Change-Id: I5c9c69aab0789b8b741353936bd753ea491972c6