Merge "Track move of tzdata: bionic to system/timezone" am: 867ff783d3 am: eaff783dd7

am: 88de1bce27

Change-Id: Ie4c1d91961c2588585751f234d9a390c66c6038c
This commit is contained in:
Nicolas Geoffray
2017-06-15 09:16:51 +00:00
committed by android-build-merger

View File

@@ -216,7 +216,7 @@ docs/features.txt platforms/${PLATFORM_NAME}/data/featur
${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts
# timezone data for layoutlib
bionic/libc/zoneinfo/tzdata platforms/${PLATFORM_NAME}/data/tzdata
system/timezone/output_data/iana/tzdata platforms/${PLATFORM_NAME}/data/tzdata
# NOTICE files are copied by build/core/Makefile from sdk.git
development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt