am e7f4d45c: am 22e1a9ab: Merge "Remove ICU from LayoutLib." into mnc-dev

* commit 'e7f4d45ce390c85d1012755bb6e5d17abc9a5eeb':
  Remove ICU from LayoutLib.
This commit is contained in:
Deepanshu Gupta
2015-05-14 06:41:04 +00:00
committed by Android Git Automerger

View File

@@ -175,7 +175,6 @@ development/tools/templates/ic_launcher_xhdpi.png platforms/${PLATFORM
# Eclipse Editors support # Eclipse Editors support
framework/layoutlib.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar framework/layoutlib.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar
framework/icu4j.jar platforms/${PLATFORM_NAME}/data/icu4j.jar
frameworks/base/core/res/res platforms/${PLATFORM_NAME}/data/res frameworks/base/core/res/res platforms/${PLATFORM_NAME}/data/res
docs/activity_actions.txt platforms/${PLATFORM_NAME}/data/activity_actions.txt docs/activity_actions.txt platforms/${PLATFORM_NAME}/data/activity_actions.txt
docs/broadcast_actions.txt platforms/${PLATFORM_NAME}/data/broadcast_actions.txt docs/broadcast_actions.txt platforms/${PLATFORM_NAME}/data/broadcast_actions.txt