Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e43e1ed authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Add missing Resources OWNERS to FrameworksCoreTests" into sc-dev am:... 

Merge "Add missing Resources OWNERS to FrameworksCoreTests" into sc-dev am: 44eb75f6 am: 67782dbb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14826388

Change-Id: Ibae508a73f810efb3cf50ceb684c9568ecefbd5d
parents 76d4eac9 67782dbb

core/tests/coretests/apks/overlay_config/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /core/java/android/content/res/OWNERS

core/tests/coretests/src/com/android/internal/content/res/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /core/java/android/content/res/OWNERS

core/tests/coretests/src/com/android/internal/content/OverlayConfigIterationRule.java→core/tests/coretests/src/com/android/internal/content/res/OverlayConfigIterationRule.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.content;

package com.android.internal.content.res;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.doAnswer;

core/tests/coretests/src/com/android/internal/content/OverlayConfigTest.java→core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.content;

package com.android.internal.content.res;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;