Merge commit '7863eb11265cd06ee35a670b5e994d65e31337c3' into eclair-mr2-plus-aosp
* commit '7863eb11265cd06ee35a670b5e994d65e31337c3':
add screenshots for the Bluetooth Chat sample app
Merge commit '2f9d8dbe9f5310bc39bf2e31c0fbc396ed6dd979' into eclair-mr2-plus-aosp
* commit '2f9d8dbe9f5310bc39bf2e31c0fbc396ed6dd979':
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
Merge commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-mr2
* commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a':
add screenshots for the Bluetooth Chat sample app
Merge commit 'fbc18f9b203c3bf808f454cb53cfc6d6bf49a8da' into eclair-mr2-plus-aosp
* commit 'fbc18f9b203c3bf808f454cb53cfc6d6bf49a8da':
Import revised translations. DO NOT MERGE
Merge commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-mr2
* commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8':
Import revised translations. DO NOT MERGE
and minor fixes.
Fix the following
- When PROPERTY_OPERATOR_NUMERIC is not set, the value is "" when CDMAPhone
is initialized. The constructor tries to extract MCC and MNC from this
property and results in a StringIndexOutOfBounds exception. Check for empty
OperatorNumeric string before trying to extract MCC and MNC
- Handle RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING response gracefully.
Change-Id: I749d6801bb4794d56e8fd672dec69dfea2b5c756
Merge commit 'b5c7ef331cfca927c5b67bfe472eb7173a0ca69f' into eclair-mr2-plus-aosp
* commit 'b5c7ef331cfca927c5b67bfe472eb7173a0ca69f':
When passing the Message for saved form data, pass the node pointer properly.
Partial fix for http://b/issue?id=2232001
We were calling obtainMessage with the node pointer as an argument. What we
really need to do is set arg1 to the node pointer. Also, avoid checking for
saved form data for password fields and fields whose names are blank.
Merge commit '4eeace3db541bd6fa0034a996630768cb521f2eb' into eclair-mr2-plus-aosp
* commit '4eeace3db541bd6fa0034a996630768cb521f2eb':
Add PageCacheCapacity to the WebSettings.
Merge commit 'f307ec5d82ce75112eb60118db89dbfee6819e90' into eclair-mr2-plus-aosp
* commit 'f307ec5d82ce75112eb60118db89dbfee6819e90':
remove accounts for authenticators that are uninstalled
Merge commit 'ba1a0717946c3d49347e663dda73aa3f91e3d642' into eclair-mr2-plus-aosp
* commit 'ba1a0717946c3d49347e663dda73aa3f91e3d642':
New constants for db upgrade.
Merge commit '6076046a11d2cd3733e4c7d108b3b26d167ae731' into eclair-mr2-plus-aosp
* commit '6076046a11d2cd3733e4c7d108b3b26d167ae731':
Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Merge commit '1ac56b602aa6a1ac54c608e5a8b76f44638db23b' into eclair-mr2
* commit '1ac56b602aa6a1ac54c608e5a8b76f44638db23b':
Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Merge commit 'cfc2915d926cee14380b54d0960262e748eed4f5' into eclair-mr2-plus-aosp
* commit 'cfc2915d926cee14380b54d0960262e748eed4f5':
In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit '9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp
* commit '9db1a37cc48a01a66ee8026de303faaf4a83667d':
DATE_TAKEN should be in millisecond instead of second.
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2
* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.
If a touch event was targeted at a ScrollView child, the content would jump after
the user moved her finger by the required threshold. This is inconsistent with
ListView's behavior.
Fixes#2296622.
