diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-10 00:16:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-10 00:16:43 +0000 |
| commit | 583a845c6eb6308d7ada72cb0e91444efc91cc54 (patch) | |
| tree | 2bc9e7b79191bf1305bfe77cb68f7df506f04079 | |
| parent | f6be5a7ac8c3891d79dd836ac5cfdc0588859494 (diff) | |
| parent | 3964ea46750cd5715f29ad4d9cada4a35208ad7a (diff) | |
| download | frameworks_base-583a845c6eb6308d7ada72cb0e91444efc91cc54.zip frameworks_base-583a845c6eb6308d7ada72cb0e91444efc91cc54.tar.gz frameworks_base-583a845c6eb6308d7ada72cb0e91444efc91cc54.tar.bz2 | |
am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."
* commit '3964ea46750cd5715f29ad4d9cada4a35208ad7a':
Switch frameworks/base/libs/androidfw to the new icu.
| -rw-r--r-- | libs/androidfw/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk index d21197e..258a296 100644 --- a/libs/androidfw/Android.mk +++ b/libs/androidfw/Android.mk @@ -75,7 +75,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := libziparchive LOCAL_C_INCLUDES := \ - external/icu4c/common \ external/zlib \ system/core/include |