OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge changes from topics "ww_4_delete_data", "ww_3_checkconfig", "ww_2_uploadIntent...
[android-x86/packages-apps-Settings.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
b9121ec
..
df85bbc
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-37,8
+37,8
@@
LOCAL_JAVA_LIBRARIES := \
ims-common
LOCAL_STATIC_JAVA_LIBRARIES := \
- a
pptoolkit-arch-cor
e-runtime \
- a
pptoolkit
-lifecycle-extensions \
+ a
ndroid-arch-lifecycl
e-runtime \
+ a
ndroid-arch
-lifecycle-extensions \
jsr305 \
settings-logtags \