Merge commit '3e6c1696135f267cc59d050747839c56ce868ef9' into kraken
* commit '3e6c1696135f267cc59d050747839c56ce868ef9':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Merge commit 'ad0830a136e1a205be42f18c4b779e50c9ac1985' into kraken
* commit 'ad0830a136e1a205be42f18c4b779e50c9ac1985':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp
* commit '11505b474b16457fb65952aadba0609cb33de8e7':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Merge commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp
* commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
Merge commit 'f4dffd8a45386b5a5f0e6de4f30facc9eaac4001' into kraken
* commit 'f4dffd8a45386b5a5f0e6de4f30facc9eaac4001':
GpsLocationProvider: Store new Location before onGpsStatusChanged is sent
Telephony: Add PUK MMI code support for CDMA RUIM phones
Type Zero Sms should not be displayed/stored/notified.
Merge commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken
* commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
Disable vorbis seek when streaming from localhost.
Merge commit '8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc' into kraken
* commit '8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc':
Doc change: New doc that describes how market filters work
Merge commit 'e96e235865830e2f0ee54e22feb20f26c3390999' into kraken
* commit 'e96e235865830e2f0ee54e22feb20f26c3390999':
Adding a few host-based stress tests for Apps on SD.
Merge commit '100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp
* commit '100ef9bee48c9beb83d885d233de6a42c64f55af':
Disable vorbis seek when streaming from localhost.
Merge commit '5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0' into froyo-plus-aosp
* commit '5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0':
Doc change: New doc that describes how market filters work
Merge commit 'f541c62b2649a4b5641df77cda3f409e9ceeb0a2' into froyo-plus-aosp
* commit 'f541c62b2649a4b5641df77cda3f409e9ceeb0a2':
Adding a few host-based stress tests for Apps on SD.
Fix some small static-initialization-order issues (and a static-
initializers-missing issue) that result from doing so. The static
libraries don't actually get used for anything real at the moment --
they're used for perf tests of bug 2660235.
Bug: 2660235
Change-Id: Iee2f38f79cc93b395e8d0a5a144ed92461f5ada0
Merge commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c' into kraken
* commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c':
Fix 2656989. Clean up update to updated system applications.
Merge commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c' into froyo-plus-aosp
* commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c':
Fix 2656989. Clean up update to updated system applications.
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken
* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
Add new keycodes for the convenience of Japanese IMEs
Call register_localized_collators() with the current locale.
Fixed deserialization problem in DatePicker.
Fix for bug 2467152 files with spaces fail to open.
Set alpha value for newly created dim surface.
telephony: Fix CID when CID is unknown
