| commit | 18c06480b0a4e22dc8ab7bb817b14044de0f1deb | [log] [tgz] |
|---|---|---|
| author | Hugh Chen <hughchen@google.com> | Thu Jan 07 00:58:58 2021 +0000 |
| committer | Hugh Chen <hughchen@google.com> | Thu Jan 07 11:54:30 2021 +0800 |
| tree | aa3cb55a930c05f02ea161298cd0df4a0941238a | |
| parent | e632315dc83ed9eac45c3e23c5b05c122a2370c1 [diff] |
DO NOT MERGE: resolve merge conflicts of c17ec818af7159f4fd678dab3bbad7ef308a7be4 to rvc-qpr-dev Bug: 167403112 Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7 Merged-In: Idc6ef558b692115bb82ea58cf223f5919b618633