diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-22 18:53:59 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-01-22 18:53:59 +0000 |
| commit | 675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8 (patch) | |
| tree | 1277544d3f6326a58a7ab5cd5c74eb44c8ef6319 /tools/buildinfo.sh | |
| parent | 30a0031e4388a54890071e7c386b20c81509f27f (diff) | |
| parent | 8f5fc9e246e3ecebbb4cf4768da027e6e34d40d5 (diff) | |
| download | build-675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8.zip build-675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8.tar.gz build-675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8.tar.bz2 | |
resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
Diffstat (limited to 'tools/buildinfo.sh')
| -rwxr-xr-x | tools/buildinfo.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index a80b2db..dcd9ab5 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -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" |