commit be44e0e0ffda04725c4864d894a7cc80bd74b5ca
author Elliott Hughes <enh@google.com> Thu Jul 10 00:08:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 10 00:08:21 2014 +0000
tree 49fa92bcc9b51b04b307b8fa6bb909e5ac387109
parent 1c1b5e51cb1acd43984ce2e82a27e61b4943186a
parent 0bffd2e60f644c8b8650c48d320c8cc22deb8ab6

am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."

* commit '0bffd2e60f644c8b8650c48d320c8cc22deb8ab6':
  Switch frameworks/av/media/libmedia to the new icu.

media/libmedia/Android.mk

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_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)