tree 838493b302a23d771f0f41f01c09c798a1098e40
parent de76f6ee3874c7f321e74e023d589a7a2f0849cf
parent 7fe39a87769278b4cb3e4e0e8f7f167f225ef222
author Hall Liu <hallliu@google.com> 1570046038 -0700
committer android-build-merger <android-build-merger@google.com> 1570046038 -0700

[automerger skipped] Merge "Add carrier config for ignoring user RTT setting" am: e93165456c
am: 7fe39a8776 -s ours
am skip reason: change_id I481fb945fd76181a0c59cb433c2959b532127153 with SHA1 788d01b71e is in history

Change-Id: I5a8d85125754ec861383f6aea9fe6e4a26506409