OSDN Git Service

Merge changes from topic 'wifi_1_1' into oc-dr1-dev
authorRoshan Pius <rpius@google.com>
Thu, 6 Jul 2017 21:52:44 +0000 (21:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 21:52:44 +0000 (21:52 +0000)
am: 291721771f

Change-Id: I8253fd29b38e8689d1593c2f707d4c9c0ec4cec9


Trivial merge