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

am: 042800ead0 Change-Id: If0d43f21710ca31149610d3e6a5f0d7e4acc11a2
2019-05-09 04:55:13 -07:00
parent 2c95b3740f 042800ead0
commit 42f6be8b40
2 changed files with 265 additions and 16 deletions
--- a/tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java
+++ b/tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.android.server.connectivity.ipmemorystore;
+package com.android.server.net.ipmemorystore;

 import static org.junit.Assert.assertEquals;