OSDN Git Service

Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev
authorLorenzo Colitti <lorenzo@google.com>
Tue, 4 Oct 2016 07:50:20 +0000 (07:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 07:50:20 +0000 (07:50 +0000)
am: 291af5c568

Change-Id: Idf4004f1cfb6b1b4c53d699f98faff5a55fc7b90


Trivial merge