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