[automerger skipped] Merge "Make the memory store operations serial." into qt-dev am: 1e5e72f27c
am:84aff06ae8-s ours am skip reason: change_id I10b5c5cd85fcb76924ba96c8c379be677774705d with SHA15d258aecb6is in history Change-Id: Ib495e479ada0fbf0d19d63e809b169f0e485df11
This commit is contained in: