| commit | cacf047daafa6ee1fee400ac75a31f0d3fffa4e2 | [log] [tgz] |
|---|---|---|
| author | Bonian Chen <bonianchen@google.com> | Sat Nov 23 02:56:24 2019 +0800 |
| committer | Bonian Chen <bonianchen@google.com> | Fri Nov 22 20:38:13 2019 +0000 |
| tree | d4fa337323341fecbd087e3e21c2f69d462165ad | |
| parent | 0e7b8f7a933a59301c621b8f23b8cfe5a1b23277 [diff] |
[Settings] Fix conflict of AOSP merge on wifi call Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95 Bug: 144960427 Test: build pass Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17 Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e