commit 61cbcf3176c7aff4728d09050a5344031afb238d
author Anthony Stange <stange@google.com> Mon Mar 16 15:24:15 2020 +0000
committer Anthony Stange <stange@google.com> Mon Mar 16 15:24:15 2020 +0000
tree 4fb6a0e64d340a7bdeb133ff839d10735032ac37
parent 95dcde1855d7875288d8eef58a6b1ec7fc8fec47

Revert "Merging from ub-launcher3-master @ build 6294827"

Revert "Merging from ub-launcher3-master @ build 6294827"

Revert submission 10673936-merge_ub-launcher3-master_6294827

Reason for revert: b/151611270
Reverted Changes:
I38a587a1b:Merging from ub-launcher3-master @ build 6294827
I74ae8bea8:Merging from ub-launcher3-master @ build 6294827
I115742e03:Merging from ub-launcher3-master @ build 6294827
Iceb1e8523:Merging from ub-launcher3-master @ build 6294827
Ie242e3907:Merging from ub-launcher3-master @ build 6294827
I609b18fdd:Merging from ub-launcher3-master @ build 6294827

Change-Id: I67e017bd01a39939bff7c45a634b8fefa2533cba

Android.mk

diff --git a/Android.mk b/Android.mk
index 987c875..c5be43b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib
-LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd SystemUISharedLib
+LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd
 LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_PACKAGE_NAME := ThemePicker