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

Commit 74a11e56 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: 44eb75f6

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

Change-Id: Iadd23142e6d04ea28cdfe74a317c69e5f5db6e65
parents 46f2336d 44eb75f6
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
include /core/java/android/content/res/OWNERS
+1 −0
Original line number Original line Diff line number Diff line
include /core/java/android/content/res/OWNERS
+2 −2
Original line number Original line 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");
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 * limitations under the License.
 * 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.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doAnswer;
+2 −2
Original line number Original line 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");
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 * limitations under the License.
 * 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.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertFalse;