[automerger skipped] Merge "Add Ethernet Tethering settings" am: 526741a2f2
am: 2b54956856
-s ours am: 6181c64279
-s ours
am skip reason: Change-Id Ia4f365ddc1a53a926d716046db3e6ac463c978b9 with SHA-1 557e457278
is in history
Change-Id: I605b4a7a128c14c7101951eb4472d6762324d675
This commit is contained in: