| commit | dc2b694a5478660ce51814838fb348f9dba71ba2 | [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 06:03:10 2021 +0000 |
| tree | 05315fb63048ad3826bd28e2dccf8a3b7554a5a3 | |
| parent | c045ccdc5ad916dad02603f41873f5e4922bc390 [diff] | |
| parent | c17ec818af7159f4fd678dab3bbad7ef308a7be4 [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: Iec4d1963e626829b696c2047c5979a684119acf7