[Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: 1c154f9197 am: 7c2d110559
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644 Change-Id: Ic64bdf7a64653c98d741cdc3a98ac420cbcbd71f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -35,6 +35,7 @@ public class AppLocaleUtil {
|
||||
|
||||
public static final Intent LAUNCHER_ENTRY_INTENT =
|
||||
new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER);
|
||||
|
||||
/**
|
||||
* Decides the UI display of per app locale.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user