tree 6f3e8bbcfbeec61f4d8adbf974a4f79bc618b3ae
parent 477211720f6dd5232e3a66814c2ec55e6ffc39fa
parent 14b9e8b6d83dbbb4dbd79b784061270f1de1a513
author Xiao Ma <xiaom@google.com> 1557402213 -0700
committer android-build-merger <android-build-merger@google.com> 1557402213 -0700

Merge "adopt non-blocking method to obtain the IpMemoryStore service."
am: 14b9e8b6d8

Change-Id: Idd6110141795f86dcf28eafab87683eda4c70b93