am 25f6b164: am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev

* commit '25f6b164c3a295ec86e832615611f61333d9db4b':
  Bundle Noto fonts with the SDK
This commit is contained in:
Deepanshu Gupta
2014-02-06 03:11:28 +00:00
committed by Android Git Automerger

View File

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