summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-01-09 10:12:58 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-01-09 10:12:58 -0800
commit11371c1229902496b7d35715a95983d7ee4dca0d (patch)
tree08499f3ea63f678b453714a520d8e5384c36ea7a
parentcc56779da62644898eb319d4b296f69d6d820013 (diff)
parent99670f29b1027fd3e586608525772356ccad37ca (diff)
downloadandroid_packages_apps_Snap-11371c1229902496b7d35715a95983d7ee4dca0d.tar.gz
android_packages_apps_Snap-11371c1229902496b7d35715a95983d7ee4dca0d.tar.bz2
android_packages_apps_Snap-11371c1229902496b7d35715a95983d7ee4dca0d.zip
Merge "SnapdragonCamera: Remove Camera2 apk."
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index b1547acc1..f230c0742 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,8 @@ LOCAL_PACKAGE_NAME := SnapdragonCamera
#LOCAL_SDK_VERSION := current
+LOCAL_OVERRIDES_PACKAGES := Camera2
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
# If this is an unbundled build (to install separately) then include