gerrit.automotivelinux Code Review - apps/settings-wifi.git/commit

author	srimaldia <hariasti.srimaldia-1@jp.alps.com>
	Tue, 13 Dec 2016 06:23:20 +0000 (15:23 +0900)
committer	srimaldia <hariasti.srimaldia-1@jp.alps.com>
	Tue, 13 Dec 2016 06:23:20 +0000 (15:23 +0900)
commit	33b36ac50b4b38988570650aff563f01389a67a8
tree	0ce963a6a38ea552332ad4a58b9b6d8e35c26faf	tree \| snapshot
parent	311d8f14ceec5b57066228f7ada4483cc4598c80	commit \| diff
parent	18e149d5c2f7155ef2933fe4e3ac15837c99235d	commit \| diff

Merge branch 'master' of ssh://gerrit.automotivelinux.org:29418/apps/settings-wifi

Signed-off-by: srimaldia <hariasti.srimaldia-1@jp.alps.com>