Merge commit 'e8c9e82d' into manualmerge

Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
This commit is contained in:
repo sync 2013-03-26 17:21:01 -07:00
commit d3e01c1577

View file

@ -193,8 +193,9 @@ installclean_files := \
$(PRODUCT_OUT)/obj/JAVA_LIBRARIES \
$(PRODUCT_OUT)/obj/FAKE \
$(PRODUCT_OUT)/obj/EXECUTABLES/adbd_intermediates \
$(PRODUCT_OUT)/obj/EXECUTABLES/init_intermediates
$(PRODUCT_OUT)/obj/EXECUTABLES/init_intermediates \
$(PRODUCT_OUT)/obj/ETC/mac_permissions.xml_intermediates \
$(PRODUCT_OUT)/obj/ETC/sepolicy_intermediates
# The files/dirs to delete during a dataclean, which removes any files
# in the staging and emulator data partitions.