am 2da21e64: (-s ours) am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflicts

* commit '2da21e64592f5016b78d3cc0fb533ded35d12ca3':
diff --git a/Android.mk b/Android.mk
index 134cfb5..aade48a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,6 +36,7 @@
 
 LOCAL_SDK_VERSION := current
 LOCAL_PACKAGE_NAME := Launcher3
+LOCAL_PRIVILEGED_MODULE := true
 #LOCAL_CERTIFICATE := shared
 
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2