OSDN Git Service
Dianne Hackborn [Tue, 11 May 2010 17:18:55 +0000 (10:18 -0700)]
am
6d00151c: Merge "Hopefully fix issue #
2662536: Why is launcher being killed?" into froyo
Merge commit '
6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp
* commit '
6d00151c519d5c131cc1480978fe4417cc7bcc79':
Hopefully fix issue #
2662536: Why is launcher being killed?
Dirk Dougherty [Tue, 11 May 2010 17:18:51 +0000 (10:18 -0700)]
am
1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
Merge commit '
1926c471a3acde38931f2cbd55415decc9879d2d' into froyo-plus-aosp
* commit '
1926c471a3acde38931f2cbd55415decc9879d2d':
Doc change: Final api diffs 7 -> 8.
Dirk Dougherty [Tue, 11 May 2010 17:18:47 +0000 (10:18 -0700)]
am
b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
Merge commit '
b32c2402c2b9d58b4f74be62dac6ce2781caec05' into froyo-plus-aosp
* commit '
b32c2402c2b9d58b4f74be62dac6ce2781caec05':
Doc change: add toc references to tictactoe sample apps and screen shots.
Jim Miller [Tue, 11 May 2010 17:18:38 +0000 (10:18 -0700)]
am
a2757901: Merge "Fix
2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit '
a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp
* commit '
a27579016caf1438400a3637e3896bec653e3756':
Fix
2660488: Add LockScreen/InCallScreen resources to preloads
Dianne Hackborn [Tue, 11 May 2010 00:27:14 +0000 (17:27 -0700)]
Merge "Hopefully fix issue #
2662536: Why is launcher being killed?" into froyo
Dirk Dougherty [Mon, 10 May 2010 23:23:13 +0000 (16:23 -0700)]
Merge "Doc change: Final api diffs 7 -> 8." into froyo
Jim Miller [Mon, 10 May 2010 22:55:41 +0000 (15:55 -0700)]
Merge "Fix
2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
The Android Open Source Project [Mon, 10 May 2010 20:48:37 +0000 (13:48 -0700)]
merge from open-source master
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
The Android Open Source Project [Mon, 10 May 2010 19:37:10 +0000 (12:37 -0700)]
merge from open-source master
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
Jean-Baptiste Queru [Mon, 10 May 2010 18:14:01 +0000 (11:14 -0700)]
Merge "Include the API level 4 fields in the Parcel."
Robert Greenwalt [Mon, 10 May 2010 17:12:58 +0000 (10:12 -0700)]
am
b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
Merge commit '
b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp
* commit '
b74a239fd2e729c41b0cb87cbc606530ed631a41':
String change to refer to wifi tether as hotspot
Robert Greenwalt [Mon, 10 May 2010 17:11:12 +0000 (10:11 -0700)]
Merge "String change to refer to wifi tether as hotspot" into froyo
Scott Main [Mon, 10 May 2010 16:56:43 +0000 (09:56 -0700)]
am
62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Merge commit '
62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp
* commit '
62c28caee4a26e106134264f917bacef77438483':
docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
Scott Main [Mon, 10 May 2010 16:54:30 +0000 (09:54 -0700)]
Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Dan Egnor [Mon, 10 May 2010 16:43:53 +0000 (09:43 -0700)]
am
7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Merge commit '
7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp
* commit '
7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
Add unit test for passing thread priority & cgroup through Binder.
Dirk Dougherty [Mon, 10 May 2010 16:43:50 +0000 (09:43 -0700)]
am
fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit '
fb70ffd993a9ec60c806b873014b2f0f6e874c77' into froyo-plus-aosp
* commit '
fb70ffd993a9ec60c806b873014b2f0f6e874c77':
Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Scott Main [Mon, 10 May 2010 16:43:47 +0000 (09:43 -0700)]
am
c4c42eef: docs: add default value and compatibility info for installLocation
Merge commit '
c4c42eef9a62846a152094d61987e6dd2728e417' into froyo-plus-aosp
* commit '
c4c42eef9a62846a152094d61987e6dd2728e417':
docs: add default value and compatibility info for installLocation
Scott Main [Mon, 10 May 2010 16:43:35 +0000 (09:43 -0700)]
am
c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
Merge commit '
c6cb8a78d03cda44a49a990b4d4153560bee7420' into froyo-plus-aosp
* commit '
c6cb8a78d03cda44a49a990b4d4153560bee7420':
docs: revisions to the new resources doc based on editorial feedback
Andreas Huber [Mon, 10 May 2010 16:43:26 +0000 (09:43 -0700)]
am
d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '
d13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp
* commit '
d13efb20089e44e6958cb9704864c03821f19e1c':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Mathias Agopian [Mon, 10 May 2010 16:43:23 +0000 (09:43 -0700)]
am
c69775d6: Merge "fix [
2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit '
c69775d616c25d31dcea119ab1e7af19148853e2' into froyo-plus-aosp
* commit '
c69775d616c25d31dcea119ab1e7af19148853e2':
fix [
2664345] Flash: Bad flicker at the end of a pinch zoom.
Dirk Dougherty [Mon, 10 May 2010 16:43:03 +0000 (09:43 -0700)]
am
0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit '
0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp
* commit '
0dd3a239519369933d4efa701479c816b4b33874':
Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Jean-Baptiste Queru [Mon, 10 May 2010 15:55:17 +0000 (08:55 -0700)]
Merge "long modifier was on the wrong argument."
Dan Egnor [Sun, 9 May 2010 14:03:46 +0000 (07:03 -0700)]
Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Dirk Dougherty [Sat, 8 May 2010 04:07:57 +0000 (21:07 -0700)]
Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Andreas Huber [Fri, 7 May 2010 20:47:42 +0000 (13:47 -0700)]
Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Mathias Agopian [Fri, 7 May 2010 20:39:29 +0000 (13:39 -0700)]
Merge "fix [
2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Jean-Baptiste Queru [Fri, 7 May 2010 19:57:02 +0000 (12:57 -0700)]
Merge "Added WEB_URL_PATTERN for Montenegro ".me""
Dirk Dougherty [Fri, 7 May 2010 17:57:48 +0000 (10:57 -0700)]
Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Brian Carlstrom [Fri, 7 May 2010 17:23:34 +0000 (10:23 -0700)]
am
e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit '
e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp
* commit '
e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe':
Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Joe Malin [Fri, 7 May 2010 15:54:53 +0000 (08:54 -0700)]
am
e50b940f: Doc Change: cherry-pick doc change from -> Add images for the index file for the SpinnerTest test application sample.
Merge commit '
e50b940f153070a631a6c0d426cb7f3207042659' into froyo-plus-aosp
* commit '
e50b940f153070a631a6c0d426cb7f3207042659':
Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Bjorn Bringert [Fri, 7 May 2010 10:40:31 +0000 (03:40 -0700)]
am
75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '
75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp
* commit '
75370e74629b4938c4472d6001eebf5e305dbc55':
Fixing: RecognitionService logcat spam "cancel called..."
Bjorn Bringert [Fri, 7 May 2010 10:37:48 +0000 (03:37 -0700)]
Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Mathias Agopian [Fri, 7 May 2010 03:21:45 +0000 (20:21 -0700)]
fix [
2664345] Flash: Bad flicker at the end of a pinch zoom.
the window manger puts SurfaceViews up before they have been
rendered into, because of that surfaceflinger doesn't have
anything ready to draw for that surface when an udpate occurs
and responds by filling the surface with black.
With this fix, we only fill those areas of the framebuffer
that would otherwise be undefined (no content at all).
in the Flash case, the "flash" window is not drawn at all
until it has some content, instead the underlaying browser
window is shown.
Change-Id: Ifb610f7f8c27b88edf83e09adc4803fc295c15a1
Dan Egnor [Fri, 7 May 2010 00:33:45 +0000 (17:33 -0700)]
am
8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '
8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp
* commit '
8a8658a5de261c2da72d431940877bd054bc9837':
Make static versions of libutils and libbinder.
Dan Egnor [Fri, 7 May 2010 00:31:48 +0000 (17:31 -0700)]
Merge "Make static versions of libutils and libbinder." into froyo
Daniel Sandler [Fri, 7 May 2010 00:24:22 +0000 (17:24 -0700)]
am
08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit '
08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp
* commit '
08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
Fix "p.m." in lockscreen (locale: es).
Daniel Sandler [Fri, 7 May 2010 00:23:03 +0000 (17:23 -0700)]
Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Robert Greenwalt [Fri, 7 May 2010 00:16:04 +0000 (17:16 -0700)]
am
f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit '
f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp
* commit '
f9dc24de53890e0a8289a4349562ed4bd9611974':
Fix ThrottleService wifi interaction
Robert Greenwalt [Fri, 7 May 2010 00:14:23 +0000 (17:14 -0700)]
Merge "Fix ThrottleService wifi interaction" into froyo
Xia Wang [Thu, 6 May 2010 23:12:38 +0000 (16:12 -0700)]
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.
Dan Morrill [Thu, 6 May 2010 23:12:33 +0000 (16:12 -0700)]
am
61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '
6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp
* commit '
6199375773a8b3c8eebec17ffc1bce2ee7169d57':
Adding PacketVideo attribution in NOTICE.
Neal Nguyen [Thu, 6 May 2010 23:12:22 +0000 (16:12 -0700)]
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.
Xia Wang [Thu, 6 May 2010 22:24:08 +0000 (15:24 -0700)]
Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
The Android Open Source Project [Thu, 6 May 2010 22:18:59 +0000 (15:18 -0700)]
merge from open-source master
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
Dan Morrill [Thu, 6 May 2010 22:11:02 +0000 (15:11 -0700)]
Merge "Adding PacketVideo attribution in NOTICE." into froyo
Dan Morrill [Thu, 6 May 2010 21:15:47 +0000 (14:15 -0700)]
Adding PacketVideo attribution in NOTICE.
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
Neal Nguyen [Thu, 6 May 2010 20:45:18 +0000 (13:45 -0700)]
Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Andreas Huber [Thu, 6 May 2010 19:36:13 +0000 (12:36 -0700)]
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.
Dirk Dougherty [Thu, 6 May 2010 19:36:10 +0000 (12:36 -0700)]
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
Dan Bornstein [Thu, 6 May 2010 19:36:05 +0000 (12:36 -0700)]
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.
Neal Nguyen [Thu, 6 May 2010 19:36:01 +0000 (12:36 -0700)]
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.
Andreas Huber [Thu, 6 May 2010 18:27:35 +0000 (11:27 -0700)]
Merge "Disable vorbis seek when streaming from localhost." into froyo
Dan Bornstein [Thu, 6 May 2010 17:01:39 +0000 (10:01 -0700)]
Merge "For issue #
2651381, allow library prelinking." into froyo
Neal Nguyen [Thu, 6 May 2010 16:44:10 +0000 (09:44 -0700)]
Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Mike Lockwood [Thu, 6 May 2010 14:50:13 +0000 (07:50 -0700)]
Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent"
Dan Egnor [Thu, 6 May 2010 07:55:09 +0000 (00:55 -0700)]
Make static versions of libutils and libbinder.
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
Suchi Amalapurapu [Thu, 6 May 2010 00:50:34 +0000 (17:50 -0700)]
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.
Dan Bornstein [Thu, 6 May 2010 00:50:28 +0000 (17:50 -0700)]
am
2d315667: For issue #
2651381, allow library prelinking.
Merge commit '
2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp
* commit '
2d315667ab733375d8c696f8c2f155bc1de9e4a2':
For issue #
2651381, allow library prelinking.
Suchi Amalapurapu [Thu, 6 May 2010 00:38:58 +0000 (17:38 -0700)]
Merge "Fix
2656989. Clean up update to updated system applications." into froyo
Jean-Baptiste Queru [Wed, 5 May 2010 23:30:53 +0000 (16:30 -0700)]
Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones"
Jean-Baptiste Queru [Wed, 5 May 2010 23:18:30 +0000 (16:18 -0700)]
Merge "Type Zero Sms should not be displayed/stored/notified."
The Android Open Source Project [Wed, 5 May 2010 22:57:42 +0000 (15:57 -0700)]
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
Jean-Baptiste Queru [Wed, 5 May 2010 20:49:58 +0000 (13:49 -0700)]
Merge "Add new keycodes for the convenience of Japanese IMEs"
mogimo [Fri, 2 Oct 2009 18:13:56 +0000 (03:13 +0900)]
Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
Jean-Baptiste Queru [Wed, 5 May 2010 20:15:24 +0000 (13:15 -0700)]
Merge "telephony: Fix CID when CID is unknown"
Jean-Michel Trivi [Wed, 5 May 2010 19:03:43 +0000 (12:03 -0700)]
am
b5fa4dff: Merge "Fix bug
2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Merge commit '
b5fa4dff0c4756ef7868926d4f373645ac0b00a9' into froyo-plus-aosp
* commit '
b5fa4dff0c4756ef7868926d4f373645ac0b00a9':
Fix bug
2594126 Do not crash when ViewRoot is trying to play a UI
Jean-Michel Trivi [Wed, 5 May 2010 19:02:18 +0000 (12:02 -0700)]
Merge "Fix bug
2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn't fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Jean-Baptiste Queru [Wed, 5 May 2010 18:16:31 +0000 (11:16 -0700)]
Merge "Call register_localized_collators() with the current locale."
Scott Main [Wed, 5 May 2010 16:27:50 +0000 (09:27 -0700)]
am
a69e10db: fix doc bug in hello gallery tutorial
Merge commit '
a69e10db2fb58deb5e27aa67c46d267af928374b' into froyo-plus-aosp
* commit '
a69e10db2fb58deb5e27aa67c46d267af928374b':
fix doc bug in hello gallery tutorial
Dianne Hackborn [Wed, 5 May 2010 06:58:26 +0000 (23:58 -0700)]
Merge "Set alpha value for newly created dim surface."
Dianne Hackborn [Wed, 5 May 2010 01:22:39 +0000 (18:22 -0700)]
am
65b2561c: Merge "Fix issue #
2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '
65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp
* commit '
65b2561c3bd74b639df0fead2041c775b7f40000':
Fix issue #
2643754: Launcher is caching widget layouts for too long
Bjorn Bringert [Wed, 5 May 2010 01:22:36 +0000 (18:22 -0700)]
am
c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '
c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp
* commit '
c9dc10908a683e37c3db23a9eaa74f04071013cf':
Build searchables list after boot
Dianne Hackborn [Wed, 5 May 2010 00:43:25 +0000 (17:43 -0700)]
Merge "Fix issue #
2643754: Launcher is caching widget layouts for too long" into froyo
Bjorn Bringert [Tue, 4 May 2010 23:57:56 +0000 (16:57 -0700)]
Merge "Build searchables list after boot" into froyo
Scott Main [Tue, 4 May 2010 23:04:46 +0000 (16:04 -0700)]
am
5e5202bd: Merge "docs: resolve doc bug bug:
2648699" into froyo
Merge commit '
5e5202bd6f9e7687fc6399762529b0ef5625e515' into froyo-plus-aosp
* commit '
5e5202bd6f9e7687fc6399762529b0ef5625e515':
docs: resolve doc bug
Scott Main [Tue, 4 May 2010 23:03:37 +0000 (16:03 -0700)]
Merge "docs: resolve doc bug bug:
2648699" into froyo
Adam Powell [Tue, 4 May 2010 22:40:36 +0000 (15:40 -0700)]
am
151af19b: Fix bug
2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit '
151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp
* commit '
151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
Fix bug
2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Jean-Baptiste Queru [Tue, 4 May 2010 22:16:32 +0000 (15:16 -0700)]
Merge "Fix for bug
2467152 files with spaces fail to open."
Andreas Huber [Tue, 4 May 2010 21:29:04 +0000 (14:29 -0700)]
am
e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
Merge commit '
e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp
* commit '
e083d0a2f50906423ab548047d436c74648fc488':
Support for Ogg Vorbis decoding in stagefright.
Andreas Huber [Tue, 4 May 2010 21:27:26 +0000 (14:27 -0700)]
Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
Scott Main [Tue, 4 May 2010 21:21:21 +0000 (14:21 -0700)]
am
01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '
014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp
* commit '
014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
docs: revise and add documentation for backup APIs
Scott Main [Tue, 4 May 2010 21:20:02 +0000 (14:20 -0700)]
Merge "docs: revise and add documentation for backup APIs" into froyo
Daniel Sandler [Tue, 4 May 2010 19:42:48 +0000 (12:42 -0700)]
am
70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '
70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp
* commit '
70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
Increase the row height of menus by 1dip.
Daniel Sandler [Tue, 4 May 2010 19:40:54 +0000 (12:40 -0700)]
Merge "Increase the row height of menus by 1dip." into froyo
Dan Morrill [Tue, 4 May 2010 19:38:03 +0000 (12:38 -0700)]
am
e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Merge commit '
e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp
* commit '
e17b4e711571198f79c0c2bad3656d58c63629e8':
Adding the backward-compatible filtering heuristics for the new device
Joe Onorato [Tue, 4 May 2010 19:37:59 +0000 (12:37 -0700)]
am
f140be6c: Call into app widget hosts when the provider is updated.
Merge commit '
f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp
* commit '
f140be6c3c21dd0f6d2214929e89d60de31d2c04':
Call into app widget hosts when the provider is updated.
Dan Morrill [Tue, 4 May 2010 19:03:45 +0000 (12:03 -0700)]
Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
The Android Open Source Project [Tue, 4 May 2010 16:20:16 +0000 (09:20 -0700)]
merge from open-source master
Change-Id: I5f552b45caae639170674213c23f154437b58afd
Romain Guy [Mon, 3 May 2010 23:25:34 +0000 (16:25 -0700)]
Merge "Fix typo of <p> end tag in appwidgets.xml"
The Android Open Source Project [Mon, 3 May 2010 23:19:19 +0000 (16:19 -0700)]
merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
Daniel Sandler [Fri, 30 Apr 2010 18:30:29 +0000 (11:30 -0700)]
am
3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
Merge commit '
3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e' into froyo-plus-aosp
* commit '
3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e':
Tweak style of recent apps dialog title.
Daniel Sandler [Fri, 30 Apr 2010 17:55:03 +0000 (10:55 -0700)]
Merge "Tweak style of recent apps dialog title." into froyo
Scott Main [Fri, 30 Apr 2010 04:23:10 +0000 (21:23 -0700)]
am
cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit '
cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp
* commit '
cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
docs: editorial revisions to the bmgr tool doc
Scott Main [Fri, 30 Apr 2010 04:22:17 +0000 (21:22 -0700)]
Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Marc Blank [Thu, 29 Apr 2010 22:40:30 +0000 (15:40 -0700)]
am
794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '
794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp
* commit '
794cd640bfa8c6d82803b59bc18cbd73627a8162':
Expose _id in ExtendedProperties subValues
Marc Blank [Thu, 29 Apr 2010 22:39:37 +0000 (15:39 -0700)]
Merge "Expose _id in ExtendedProperties subValues" into froyo
Kenny Root [Thu, 29 Apr 2010 22:29:22 +0000 (15:29 -0700)]
am
77a1beb1: Merge "Import revised translations" into froyo
Merge commit '
77a1beb137948ad45423bb8fcd7e424e36144133' into froyo-plus-aosp
* commit '
77a1beb137948ad45423bb8fcd7e424e36144133':
Import revised translations
Kenny Root [Thu, 29 Apr 2010 22:28:15 +0000 (15:28 -0700)]
Merge "Import revised translations" into froyo
Scott Main [Thu, 29 Apr 2010 22:23:32 +0000 (15:23 -0700)]
am
764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '
764caf2481d935ce6870ec141f1e845178df8b47' into froyo-plus-aosp
* commit '
764caf2481d935ce6870ec141f1e845178df8b47':
docs: rewrite information about using shared preferences, internal and
Scott Main [Thu, 29 Apr 2010 22:21:34 +0000 (15:21 -0700)]
Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo