Bonian Chen 821a1259e7 [Settings] Fix conflict of AOSP merge ...

Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c
Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3

2019-11-22 02:36:11 +00:00

..

android/settings

[Settings] Fix conflict of AOSP merge

2019-11-22 02:36:11 +00:00