am f7449cdb: Merge "Package renamed fonts again." into lmp-preview-dev

* commit 'f7449cdb18aeef440c8b1e2d7e99ec9970fc7f8a':
  Package renamed fonts again.
This commit is contained in:
Deepanshu Gupta
2014-06-12 16:54:21 +00:00
committed by Android Git Automerger

View File

@@ -170,8 +170,7 @@ docs/widgets.txt platforms/${PLATFORM_NAME}/data/widget
docs/features.txt platforms/${PLATFORM_NAME}/data/features.txt docs/features.txt platforms/${PLATFORM_NAME}/data/features.txt
# fonts for layoutlib. # fonts for layoutlib.
frameworks/base/data/fonts platforms/${PLATFORM_NAME}/data/fonts ${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts
external/noto-fonts platforms/${PLATFORM_NAME}/data/fonts
# NOTICE files are copied by build/core/Makefile from sdk.git # NOTICE files are copied by build/core/Makefile from sdk.git
development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt