resolved conflicts for merge of 8f5fc9e2
to lmp-mr1-dev-plus-aosp
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
This commit is contained in:
@@ -36,11 +36,8 @@ echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT"
|
||||
echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT"
|
||||
|
||||
echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"
|
||||
if [ -n "$PRODUCT_DEFAULT_LANGUAGE" ] ; then
|
||||
echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE"
|
||||
fi
|
||||
if [ -n "$PRODUCT_DEFAULT_REGION" ] ; then
|
||||
echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION"
|
||||
if [ -n "$PRODUCT_DEFAULT_LOCALE" ] ; then
|
||||
echo "ro.product.locale=$PRODUCT_DEFAULT_LOCALE"
|
||||
fi
|
||||
echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS"
|
||||
echo "ro.board.platform=$TARGET_BOARD_PLATFORM"
|
||||
|
Reference in New Issue
Block a user