OSDN Git Service

Merge "Expose fields in WifiConfiguration." am: 1ea4180c3a am: ce13838ade
authorAmin Shaikh <ashaikh@google.com>
Tue, 10 Jan 2017 00:04:00 +0000 (00:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 00:04:00 +0000 (00:04 +0000)
am: a0961255fc

Change-Id: I1232829112d6f5ba5fa99199555e584c91ae35af


Trivial merge