| commit | 6d996e01383383e42498c31ef1e0e33c990c8212 | [log] [tgz] |
|---|---|---|
| author | Hugh Chen <hughchen@google.com> | Thu Jan 07 00:58:58 2021 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Tue Feb 09 01:24:35 2021 +0000 |
| tree | 05315fb63048ad3826bd28e2dccf8a3b7554a5a3 | |
| parent | db10b5d0385d5e79347220ca9309aa412e5eeabe [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 (cherry picked from commit dc2b694a5478660ce51814838fb348f9dba71ba2)