Merge commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp
* commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c':
Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp
* commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
docs: update web page debugging with info about page and line
Merge commit '196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp
* commit '196ec566b39340942f146ce4a9af775f4c648d2d':
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Merge commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp
* commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
doc change only: Update announcement and mwc redirect to point to microsite.
Merge commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7' into eclair-plus-aosp
* commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7':
Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171' into eclair-plus-aosp
* commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171':
Fix the reporting of NO_CONNECTIVITY.
Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp
* commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750':
Refine fix I53e91db7 to apply only to wifi network
Merge commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp
* commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e':
docs: reference the history JS file with docRoot in order to
Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp
* commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737':
disable high-quality filtering during scrolling, until I can cached the scaled images.
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp
* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Merge commit 'a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp
* commit 'a59551bade6a7b0c916c277f044de79c6af1bd22':
Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
Merge commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8' into eclair-plus-aosp
* commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8':
Handle emergency calls only status in ServiceStateTracker.
Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp
* commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
initialize sync adapters that get installed while the system is running
Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp
* commit '036e21083d9936425687d7de29e95b2c458a7e4a':
Fix NPE when importing from USIM.
Merge commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp
* commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp
* commit '495bae67ff7df4a11325a4cc1d8af288f82128fe':
fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp
* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
Find layout classes in all "layout-*" dirs.
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp
* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
Try to switch to another default net on connection failure.
