resolve merge conflicts of 07886f1
to nyc-dev-plus-aosp
Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
This commit is contained in:
commit
98dce87fe1
5 changed files with 9 additions and 1 deletions
|
@ -125,7 +125,6 @@ _product_var_list := \
|
|||
PRODUCT_SHIPPING_API_LEVEL \
|
||||
|
||||
|
||||
|
||||
define dump-product
|
||||
$(info ==== $(1) ====)\
|
||||
$(foreach v,$(_product_var_list),\
|
||||
|
|
3
target/product/product_launched_with_l.mk
Normal file
3
target/product/product_launched_with_l.mk
Normal 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
|
||||
|
2
target/product/product_launched_with_l_mr1.mk
Normal file
2
target/product/product_launched_with_l_mr1.mk
Normal 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
|
2
target/product/product_launched_with_m.mk
Normal file
2
target/product/product_launched_with_m.mk
Normal 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
|
2
target/product/product_launched_with_n.mk
Normal file
2
target/product/product_launched_with_n.mk
Normal 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
|
Loading…
Reference in a new issue