Merge "Bump support library version to 23.0.1 DO NOT MERGE" into mnc-dev
diff --git a/build/Android.mk b/build/Android.mk
index 8b0124b..72ec31d 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -117,7 +117,8 @@
android-support-multidex \
android-support-multidex-instrumentation \
android-support-design \
- android-support-percent
+ android-support-percent \
+ android-support-customtabs
$(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib))))
diff --git a/build/sdk.atree b/build/sdk.atree
index f0f7eae..ee1e251 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -519,6 +519,8 @@
frameworks/support/percent/src/.readme extras/android/support/percent/src/.readme
${OUT_DIR}/target/common/obj/PACKAGING/android-support-percent_intermediates/android-support-percent.jar extras/android/support/percent/libs/android-support-percent.jar
+frameworks/support/customtabs/AndroidManifest.xml extras/android/support/customtabs/AndroidManifest.xml
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-customtabs_intermediates/android-support-customtabs.jar extras/android/support/customtabs/libs/android-support-customtabs.jar
##############################################################################
# Tests Component
##############################################################################
