Commit Graph

15179 Commits

Author SHA1 Message Date
Jim Miller
321cc6c247 am ab4f3c60: Merge "Manual integration of I32a7b5 from froyo" into kraken 2010-05-06 16:37:17 -07:00
Jim Miller
178a722585 Merge "Manual integration of I32a7b5 from froyo" into kraken 2010-05-06 16:36:23 -07:00
Xia Wang
db070c4d35 am 0bfc3973: am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo 2010-05-06 16:35:06 -07:00
Dan Morrill
790960ee5b am 9fd3a6be: am 60b02cab: am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo 2010-05-06 16:35:01 -07:00
Neal Nguyen
b2f551e4c1 am bda001aa: am ad0830a1: am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo 2010-05-06 16:34:57 -07:00
Xia Wang
aea38f076c am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '3e6c1696135f267cc59d050747839c56ce868ef9' into kraken

* commit '3e6c1696135f267cc59d050747839c56ce868ef9':
  Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
2010-05-06 16:31:36 -07:00
Dan Morrill
64c83cfb6a am 60b02cab: am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '60b02cab9cba74e4fe1fcbe64af85ed867d20cf9' into kraken

* commit '60b02cab9cba74e4fe1fcbe64af85ed867d20cf9':
  Adding PacketVideo attribution in NOTICE.
2010-05-06 16:31:31 -07:00
Neal Nguyen
6dcfe1413a am ad0830a1: am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit 'ad0830a136e1a205be42f18c4b779e50c9ac1985' into kraken

* commit 'ad0830a136e1a205be42f18c4b779e50c9ac1985':
  Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
2010-05-06 16:31:27 -07:00
Xia Wang
363809c71d am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp

* commit '11505b474b16457fb65952aadba0609cb33de8e7':
  Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
2010-05-06 16:12:38 -07:00
Dan Morrill
126a6eab49 am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp

* commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57':
  Adding PacketVideo attribution in NOTICE.
2010-05-06 16:12:33 -07:00
Neal Nguyen
649f6f64b4 am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp

* commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4':
  Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
2010-05-06 16:12:22 -07:00
The Android Open Source Project
01f0504764 am 9d164dc5: am f4dffd8a: merge from open-source master 2010-05-06 15:32:57 -07:00
Xia Wang
a62ab7c22a Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo 2010-05-06 15:24:08 -07:00
The Android Open Source Project
d37aff7dff am f4dffd8a: merge from open-source master
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.
2010-05-06 15:22:17 -07:00
The Android Open Source Project
3877d301aa merge from open-source master
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
2010-05-06 15:18:59 -07:00
Dan Morrill
2e55d964ca Merge "Adding PacketVideo attribution in NOTICE." into froyo 2010-05-06 15:11:02 -07:00
Dan Morrill
869aba8aaf Adding PacketVideo attribution in NOTICE.
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
2010-05-06 14:15:47 -07:00
Neal Nguyen
ad8507cfdc Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo 2010-05-06 13:45:18 -07:00
Andreas Huber
1fa16b6a8a am 8a1c0934: am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo 2010-05-06 12:46:39 -07:00
Dirk Dougherty
96658757f7 am 799bc84d: am 8b6ac78e: am 5305627d: Doc change: New doc that describes how market filters work 2010-05-06 12:46:35 -07:00
Dan Bornstein
51a7d6ff3e am ea5477c8: am 89ad07b0: am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo 2010-05-06 12:46:31 -07:00
Neal Nguyen
44271f887c am 73bbcc4d: am e96e2358: am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo 2010-05-06 12:46:27 -07:00
Andreas Huber
5934c599f5 am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken

* commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
  Disable vorbis seek when streaming from localhost.
2010-05-06 12:43:59 -07:00
Dirk Dougherty
a95ff455ec am 8b6ac78e: am 5305627d: Doc change: New doc that describes how market filters work
Merge commit '8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc' into kraken

* commit '8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc':
  Doc change: New doc that describes how market filters work
2010-05-06 12:43:56 -07:00
Dan Bornstein
76289d8b0f am 89ad07b0: am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo
Merge commit '89ad07b048ff035394596d6a8916f639f3f0b868' into kraken

* commit '89ad07b048ff035394596d6a8916f639f3f0b868':
  For issue #2651381, allow library prelinking.
2010-05-06 12:43:52 -07:00
Neal Nguyen
bbe5688c3e am e96e2358: am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit 'e96e235865830e2f0ee54e22feb20f26c3390999' into kraken

* commit 'e96e235865830e2f0ee54e22feb20f26c3390999':
  Adding a few host-based stress tests for Apps on SD.
2010-05-06 12:43:48 -07:00
Andreas Huber
aeb4f0751f am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp

* commit '100ef9bee48c9beb83d885d233de6a42c64f55af':
  Disable vorbis seek when streaming from localhost.
2010-05-06 12:36:13 -07:00
Dirk Dougherty
b9575af85c am 5305627d: Doc change: New doc that describes how market filters work
Merge commit '5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0' into froyo-plus-aosp

* commit '5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0':
  Doc change: New doc that describes how market filters work
2010-05-06 12:36:10 -07:00
Dan Bornstein
afa867debe am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo
Merge commit '42ee86e66d972dcdf240e549e5fdc151a144af64' into froyo-plus-aosp

* commit '42ee86e66d972dcdf240e549e5fdc151a144af64':
  For issue #2651381, allow library prelinking.
2010-05-06 12:36:05 -07:00
Neal Nguyen
7cc7372cb9 am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit 'f541c62b2649a4b5641df77cda3f409e9ceeb0a2' into froyo-plus-aosp

* commit 'f541c62b2649a4b5641df77cda3f409e9ceeb0a2':
  Adding a few host-based stress tests for Apps on SD.
2010-05-06 12:36:01 -07:00
Andreas Huber
2da054cbe4 Merge "Disable vorbis seek when streaming from localhost." into froyo 2010-05-06 11:27:35 -07:00
Dan Bornstein
64e6c7296e Merge "For issue #2651381, allow library prelinking." into froyo 2010-05-06 10:01:39 -07:00
Neal Nguyen
5c9d242fe4 Merge "Adding a few host-based stress tests for Apps on SD." into froyo 2010-05-06 09:44:10 -07:00
Mike Lockwood
06979ad3df Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent" 2010-05-06 07:50:13 -07:00
Suchi Amalapurapu
1b2896ee40 am 9c08d5c5: am 9dfc6971: am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo 2010-05-05 17:54:53 -07:00
Dan Bornstein
f719d66610 am ebd2890b: am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking. 2010-05-05 17:54:49 -07:00
Suchi Amalapurapu
9dd9dfd825 am 9dfc6971: am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo
Merge commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c' into kraken

* commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c':
  Fix 2656989. Clean up update to updated system applications.
2010-05-05 17:52:25 -07:00
Dan Bornstein
b27eed1629 am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.
Merge commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8' into kraken

* commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8':
  For issue #2651381, allow library prelinking.
2010-05-05 17:52:22 -07:00
Suchi Amalapurapu
5b1932c2ce am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo
Merge commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c' into froyo-plus-aosp

* commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c':
  Fix 2656989. Clean up update to updated system applications.
2010-05-05 17:50:34 -07:00
Dan Bornstein
09667f43c1 am 2d315667: For issue #2651381, allow library prelinking.
Merge commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp

* commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2':
  For issue #2651381, allow library prelinking.
2010-05-05 17:50:28 -07:00
Suchi Amalapurapu
110ecf0542 Merge "Fix 2656989. Clean up update to updated system applications." into froyo 2010-05-05 17:38:58 -07:00
Jean-Baptiste Queru
afeaca2513 Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones" 2010-05-05 16:30:53 -07:00
Jean-Baptiste Queru
d40eb168d1 Merge "Type Zero Sms should not be displayed/stored/notified." 2010-05-05 16:18:30 -07:00
The Android Open Source Project
830b5c7e2b am 579e08e6: am f7896449: merge from open-source master 2010-05-05 16:13:49 -07:00
The Android Open Source Project
ad3f4a4561 am f7896449: merge from open-source master
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
2010-05-05 16:00:01 -07:00
The Android Open Source Project
30f71ce597 merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -07:00
Jaikumar Ganesh
b457889b75 am 33232d26: Merge "Add UUID property for adapter." into kraken 2010-05-05 15:43:54 -07:00
Dianne Hackborn
fc7da7a83b am f41f444d: Merge "First pass at NativeActivity." into kraken 2010-05-05 15:43:41 -07:00
Jaikumar Ganesh
b0151801a0 Merge "Add UUID property for adapter." into kraken 2010-05-05 15:25:54 -07:00
Dianne Hackborn
5839405089 Merge "First pass at NativeActivity." into kraken 2010-05-05 15:18:59 -07:00