tree 1e8a46b8318aaa1b3d3da1e88af2c577592a6e77
parent d2767b1be00f336b98dcbdaa13a571873a3a2afc
parent bed150058260d86501593c463ad3cffa913ffcf0
author Mohammad Samiul Islam <samiul@google.com> 1594412764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594412764 +0000

[automerger skipped] Merge "Fix deadlock in StagingManager.getSessions() method" into rvc-dev am: c25a56caed am: 2ebf7b3667 am: 10dc5a3796 am: bed1500582 -s ours

am skip reason: Change-Id I7a1abf44db27d4673d43e9b0886610a5bd8b41f6 with SHA-1 c45b6a146c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12117348

Change-Id: I1db4b8788b67af2ef6c226f3b3deef2f48c66c36