diff options
| author | The Android Automerger <android-build@android.com> | 2011-10-26 12:21:07 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-10-26 12:21:07 +0000 |
| commit | 6a060b4ec54893a65d74ab2204d34504ace3411a (patch) | |
| tree | 1dd6df006dd55fd7debf4a914143ca8b14a2a4dd | |
| parent | ed013f5eeb73fc46cbc5b909da40862a0db68c38 (diff) | |
| parent | 665ce5e0208ff43d13d8e23b7857b811584022b7 (diff) | |
| download | device_samsung_tuna-6a060b4ec54893a65d74ab2204d34504ace3411a.zip device_samsung_tuna-6a060b4ec54893a65d74ab2204d34504ace3411a.tar.gz device_samsung_tuna-6a060b4ec54893a65d74ab2204d34504ace3411a.tar.bz2 | |
ics-mr0 hand merge to avoid conflicts
Change-Id: I220aa41c50473717e8407e43c383fae09cdcf302
| -rw-r--r-- | BoardConfig.mk | 7 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index f2ef2ec..b1a43ac 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -30,12 +30,7 @@ ARCH_ARM_HAVE_TLS_REGISTER := true TARGET_NO_BOOTLOADER := true BOARD_KERNEL_BASE := 0x80000000 - -ifeq ($(strip $(TARGET_BUILD_VARIANT)),user) -BOARD_KERNEL_CMDLINE := -else -BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 androidboot.console=ttyO2 -endif +# BOARD_KERNEL_CMDLINE := TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := omap4 diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 55aac19..5e46866 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -76,7 +76,7 @@ than the size of the config_autoBrightnessLevels array. --> <integer-array name="config_autoBrightnessLcdBacklightValues"> - <item>10</item> + <item>16</item> <item>40</item> <item>60</item> <item>70</item> |