| commit | 4bf7c3a921c15dcdc50b6aa52ff7b476c8e76120 | [log] [tgz] |
|---|---|---|
| author | hughchen <hughchen@google.com> | Tue May 08 16:52:18 2018 +0800 |
| committer | Hugh Chen <hughchen@google.com> | Wed May 16 08:03:00 2018 +0000 |
| tree | c58ac9c7de2344dd6a2d1ee2551f912fa677c0ab | |
| parent | 5de68ea81a646453d66c64f0b16ae8b5c5f173b4 [diff] |
Bluetooth and NFC added back to Connection preferences * For fix the TreeHugger error in pi-dev, cherry pick the ag/4023339 in master and fix TreeHugger "Automatic merge failed" error. * Bluetooth and NFC added back to "Connection preferences" Bug: 79299421 Test: make -j50 RunSettingsRoboTests Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90