LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of c91c719f to klp-modular-dev-plus-aosp

Browse Source 
Change-Id: I0c942398f6acecf072da1a2148fbc900a609e870
This commit is contained in:
Deepanshu Gupta
2014-06-17 17:27:29 -07:00
parent 5405d94a47 c91c719f91
commit 40c2c69bd8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/sdk.atree
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