commit c91c719f91fe9b24c136469a34e848899e67b11f
author Deepanshu Gupta <deepanshu@google.com> Wed Jun 18 00:15:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 18 00:15:40 2014 +0000
tree fb695761822bef6fe80300cd360152d9c4b0b2c3
parent 6c9d1af8213394eb9458e71f2e6d62c4de716902
parent dd2dac3659cad1594ce3a72f10b1216424b62441

am dd2dac36: am edf631de: Package renamed fonts. [DO NOT MERGE]

* commit 'dd2dac3659cad1594ce3a72f10b1216424b62441':
  Package renamed fonts. [DO NOT MERGE]

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index a902551..d1000f3 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -169,8 +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
+${FONT_OUT}                   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