diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-10 00:08:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-10 00:08:21 +0000 |
| commit | be44e0e0ffda04725c4864d894a7cc80bd74b5ca (patch) | |
| tree | 49fa92bcc9b51b04b307b8fa6bb909e5ac387109 /media | |
| parent | 1c1b5e51cb1acd43984ce2e82a27e61b4943186a (diff) | |
| parent | 0bffd2e60f644c8b8650c48d320c8cc22deb8ab6 (diff) | |
| download | frameworks_av-be44e0e0ffda04725c4864d894a7cc80bd74b5ca.zip frameworks_av-be44e0e0ffda04725c4864d894a7cc80bd74b5ca.tar.gz frameworks_av-be44e0e0ffda04725c4864d894a7cc80bd74b5ca.tar.bz2 | |
am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."
* commit '0bffd2e60f644c8b8650c48d320c8cc22deb8ab6':
Switch frameworks/av/media/libmedia to the new icu.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 56e7787..1e322f9 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -76,7 +76,7 @@ LOCAL_MODULE:= libmedia LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ $(TOP)/frameworks/native/include/media/openmax \ - external/icu4c/common \ + external/icu/icu4c/source/common \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) |