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