tree 757f0eb83444f5fc1aad67a8306a2154ab992e45
parent c52e9cfd3dfa23341ccd5034fa5ab5ce132bf624
parent 03f0859f856f19d731adb21f122aa24b63e80e49
author Hall Liu <hallliu@google.com> 1570046061 -0700
committer android-build-merger <android-build-merger@google.com> 1570046061 -0700

[automerger skipped] Merge changes from topic "cp-att-rtt-switch" am: 3041cd6ae1
am: 03f0859f85 -s ours
am skip reason: change_id Ica8c6a0a9634611a82c208d59040dd7a3c95b3fc with SHA1 b574d5f303 is in history

Change-Id: I8b24d60059ae9365b0106bbb23dec72791ab1c80