tree df121891cddf74834e92020356c9932c95db29fd
parent 1d08e3d347d2d8f58b126d42fb78901e0b4887b3
parent 7f3b2981b1d6b8989787ad81a8817f97267eda78
author Hall Liu <hallliu@google.com> 1523911932 -0700
committer android-build-merger <android-build-merger@google.com> 1523911932 -0700

[automerger skipped] Merge "Move RTT system setting to Settings.Secure" am: 151095a09e
am: 7f3b2981b1  -s ours

Change-Id: I7fe7a68ad44a397adff6a4a90d4d8cab2295801f