[automerger skipped] Merge "adopt non-blocking method to obtain the IpMemoryStore service." into qt-dev am: 29510ea4d8 -s ours
am:ac9eef3530-s ours am skip reason: change_id I7de4f23370bdf9c9df5e74ed074c794080d93d95 with SHA1afc8845452is in history Change-Id: I0c382d8b7909ac2bac194071693132ab558f5051
This commit is contained in: