Merge commit '5ce738206294252fb1972d42bd830fee41acb137'
* commit '5ce738206294252fb1972d42bd830fee41acb137':
Fix FallRS by keeping a reference to the mesh.
Merge commit '1cef22890d10417977397a5dccf34956858d0803' into eclair-plus-aosp
* commit '1cef22890d10417977397a5dccf34956858d0803':
Disable data call in emergency call
Merge commit '6f89172b6e149c623fe582e4baa658299a3fc72c' into eclair-plus-aosp
* commit '6f89172b6e149c623fe582e4baa658299a3fc72c':
Fix FallRS by keeping a reference to the mesh.
Merge commit '0949f652ee2e84ef46d12ac692620286925ded6e'
* commit '0949f652ee2e84ef46d12ac692620286925ded6e':
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
Merge commit 'd3d794530962e69df54b6421ed5e0d03d76165ab' into eclair-plus-aosp
* commit 'd3d794530962e69df54b6421ed5e0d03d76165ab':
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
* changes:
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
Merge commit 'ed383866032d1c7fb5141d516a5dbddaf973a5bf'
* commit 'ed383866032d1c7fb5141d516a5dbddaf973a5bf':
do not merge. Remove voicesearch-specific functionality from framework.
Merge commit 'f1b64f64ab088a3e8cd32ec31f61c958c61d19e5' into eclair-plus-aosp
* commit 'f1b64f64ab088a3e8cd32ec31f61c958c61d19e5':
do not merge. Remove voicesearch-specific functionality from framework.
Merge commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6' into eclair-plus-aosp
* commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6':
Cleaning up Presence API
Merge commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6' into eclair-plus-aosp
* commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6':
Framework changes to support HSDPA/HSUPA/HSPA
Merge commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083' into eclair-plus-aosp
* commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083':
Adding a "Photo" directory under Contacts.
Merge commit 'b5a79aa3e56321f5616ca560e1e7930193fd392a'
* commit 'b5a79aa3e56321f5616ca560e1e7930193fd392a':
Fix typo: the x offset was assigned to the y coordinate.
HSDPA: High-Speed Downlink Packet Access
HSUPA: High-Speend Uplink Packet Access
HSPA: High-Speed Packet Access
Add support for HSDPA/HSUPA/HSPA:
1) extend TelephonyManager.NETWORK_TYPE for HSDPA/HSUPA/HSPA
2) extend ServiceState.RADIO_TECHNOLOGY for HSDPA/HSUPA/HSPA
3) set radioTechnology into ServiceState in GsmServiceStateTracker
4) change the implementation of TelephonyManager.getNetworkType to
solve the competition timing issue between the time of setting
system property and the time of receiving notification through
PhoneStateListener
4.1) add a getNetworkType interface in ITelephony.aidl
5) add icons resources for HSDPA/HSUPA/HSPA
6) make use of HSDPA/HSUPA/HSPA icons in StatusBarPolicy
Merge commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9' into eclair-plus-aosp
* commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9':
Fix typo: the x offset was assigned to the y coordinate.
Merge commit '53cc3b3c864d51b46851f77137e2563e3782172c'
* commit '53cc3b3c864d51b46851f77137e2563e3782172c':
Replace fullHeight support by fullSize (height and width)
Merge commit '51afbd308dff8bd7accf5510e60367107d4c40a1' into eclair-plus-aosp
* commit '51afbd308dff8bd7accf5510e60367107d4c40a1':
Replace fullHeight support by fullSize (height and width)
I haven't touched instances of "behaviour", "dequeue", "removeable",
"resizeable", or "removeable" because all are accepted variant spellings
and I don't know what the policy is on such things.
Merge commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8'
* commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8':
Remove third party support for Quick Search Box (aka global search).
