commit | b9bf8afe420c6051b135811e78b1fbcb4321ebcf | [log] [tgz] |
---|---|---|
author | Josh Tsuji <tsuji@google.com> | Wed Jul 01 16:12:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 01 16:12:51 2020 +0000 |
tree | 04805c9d6f45167dcbf941173efdc51758d19c90 | |
parent | 939661f36ff0d27f4ba3a48dadb836943dbad0d0 [diff] | |
parent | d2b9a9051c2e0e16fdf7abccd930764cbe0c8335 [diff] |
Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev am: 831ac87a9b am: 58295346d8 am: a7424effb9 am: d2b9a9051c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047870 Change-Id: I8f895b97c688cb0406c0f2390a74ecc9ad98d206