commit | c1d983f6b502e786186f3ea0df86df3787e4d33c | [log] [tgz] |
---|---|---|
author | Agatha Man <agathaman@google.com> | Mon Sep 16 16:31:06 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Sep 16 16:31:06 2019 -0700 |
tree | 1354cb7134e851846a7942f81521a76e5802288b | |
parent | 550f04081c196c5a024b37bd25564695f7c996fc [diff] | |
parent | 30230e75b50e0c76c0401198a79bee37dd578127 [diff] |
[automerger skipped] Merge "Modified ShortcutManagerMultiuserTest.testSecondaryUser to use existing secondary user if possible and switch to initial user at tearDown" into pie-cts-dev am: 8ee595d40c am: c8f91e739c -s ours am: 30230e75b5 -s ours am skip reason: change_id Ie3437657a6ecd0be9b9fb11b5acbd440adf0b934 with SHA1 99bbf90c8c is in history Change-Id: I2a01f8275e7cf1b37b373fa92b8eb198f0fd685e