resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp

Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
This commit is contained in:
Vikas Marwaha 2016-06-08 20:14:48 -07:00 committed by Dan Willemsen
commit 98dce87fe1
5 changed files with 9 additions and 1 deletions

View file

@ -125,7 +125,6 @@ _product_var_list := \
PRODUCT_SHIPPING_API_LEVEL \
define dump-product
$(info ==== $(1) ====)\
$(foreach v,$(_product_var_list),\

View file

@ -0,0 +1,3 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launced on.
PRODUCT_SHIPPING_API_LEVEL := 21

View file

@ -0,0 +1,2 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launced on.
PRODUCT_SHIPPING_API_LEVEL := 22

View file

@ -0,0 +1,2 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launced on.
PRODUCT_SHIPPING_API_LEVEL := 23

View file

@ -0,0 +1,2 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launced on.
PRODUCT_SHIPPING_API_LEVEL := 24