commit 61ec9aed12b1b03b01623707e21dfa03590f4e18
author Prathmesh Prabhu <pprabhu@google.com> Sat Feb 20 01:02:03 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 20 01:02:03 2016 +0000
tree 670641342a759e9d5b79b1f49f6e3f476dfadde9
parent d2cd53a41b29b9ae4e7ded805a5d5f781c5e1787
parent ae74914ed9b3c894be63d4636c88a8cbb1360e7b

Merge "Allow smooth upgrade of AVD's from older API's." into nyc-dev

target/product/sdk_base.mk

diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index 12a8da5..7cb1fd3 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -61,6 +61,7 @@
 
 PRODUCT_COPY_FILES := \
 	device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
+	device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \
 	frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
 	frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
 	frameworks/base/data/sounds/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \