diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-10 00:42:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-10 00:42:48 +0000 |
| commit | e8e968a7c6f08c8db0603143d775863301cb03d6 (patch) | |
| tree | 327b9396437fd9658f872e6810f0e3f5ffe96706 /libs/androidfw | |
| parent | b58d385e17f3b71705f23fe77aa8c12147ec9ea5 (diff) | |
| parent | 583a845c6eb6308d7ada72cb0e91444efc91cc54 (diff) | |
| download | frameworks_base-e8e968a7c6f08c8db0603143d775863301cb03d6.zip frameworks_base-e8e968a7c6f08c8db0603143d775863301cb03d6.tar.gz frameworks_base-e8e968a7c6f08c8db0603143d775863301cb03d6.tar.bz2 | |
am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."
* commit '583a845c6eb6308d7ada72cb0e91444efc91cc54':
Switch frameworks/base/libs/androidfw to the new icu.
Diffstat (limited to 'libs/androidfw')
| -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 957809d..dbee7ed 100644 --- a/libs/androidfw/Android.mk +++ b/libs/androidfw/Android.mk @@ -76,7 +76,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := libziparchive LOCAL_C_INCLUDES := \ - external/icu4c/common \ external/zlib \ system/core/include |