OSDN Git Service
Andreas Huber [Tue, 25 May 2010 21:16:18 +0000 (14:16 -0700)]
Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
Eric Laurent [Tue, 25 May 2010 19:42:53 +0000 (12:42 -0700)]
Merge "Fix the simulator build broken by commit
5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
Eric Laurent [Tue, 25 May 2010 06:23:29 +0000 (23:23 -0700)]
Merge "Fix issue
2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
Mathias Agopian [Tue, 25 May 2010 01:30:35 +0000 (18:30 -0700)]
Merge "added the notion of fixed-size buffers" into kraken
Mathias Agopian [Tue, 25 May 2010 01:30:25 +0000 (18:30 -0700)]
Merge "fix a bug when reallocating a window's buffers is needed" into kraken
Mathias Agopian [Sat, 22 May 2010 00:24:35 +0000 (17:24 -0700)]
added the notion of fixed-size buffers
the new native_window_set_buffers_geometry allows
to specify a size and format for all buffers to be
dequeued. the buffer will be scalled to the window's
size.
Change-Id: I2c378b85c88d29cdd827a5f319d5c704d79ba381
Adam Powell [Mon, 24 May 2010 23:26:06 +0000 (16:26 -0700)]
am
f67c874c: am
7e5e3745: Fix bug
2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit '
f67c874c07d2e0ff888cc88679f884a833f89870' into kraken
* commit '
f67c874c07d2e0ff888cc88679f884a833f89870':
Fix bug
2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Adam Powell [Mon, 24 May 2010 23:23:53 +0000 (16:23 -0700)]
am
7e5e3745: Fix bug
2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit '
7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '
7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug
2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Mathias Agopian [Fri, 21 May 2010 21:51:33 +0000 (14:51 -0700)]
fix a bug when reallocating a window's buffers is needed
we need to mark the buffers that need to be reallocated,
NOT the buffer's indices.
Change-Id: I809e2e1b03b56c4d2ab983c25523dae99aa1da74
Mike Lockwood [Mon, 24 May 2010 19:59:27 +0000 (12:59 -0700)]
Merge "Add Geocorder.isImplemented()" into kraken
James Dong [Mon, 24 May 2010 17:54:25 +0000 (10:54 -0700)]
Merge "Properly handle start code in H264/AVC encoder output" into kraken
Dirk Dougherty [Mon, 24 May 2010 17:01:49 +0000 (10:01 -0700)]
am
3cffe1ab: am
c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit '
3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken
* commit '
3cffe1ababdb09f4a90274e25c2f66feee299835':
Doc change: Fix incorrect adt version reference etc.
Dirk Dougherty [Mon, 24 May 2010 16:56:47 +0000 (09:56 -0700)]
am
c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit '
c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp
* commit '
c7c7afd7a1af36e787266815487f4600196406b8':
Doc change: Fix incorrect adt version reference etc.
Daniel Sandler [Mon, 24 May 2010 12:45:56 +0000 (05:45 -0700)]
Merge "New shadowy status bar, direct from Z'ha'dum." into kraken
Chih-Chung Chang [Mon, 24 May 2010 04:04:01 +0000 (21:04 -0700)]
Merge "Disable CameraServiceTest in a normal build." into kraken
Mathias Agopian [Fri, 21 May 2010 21:19:50 +0000 (14:19 -0700)]
added native_window_set_buffer_count()
this method can be used to change the number of buffers
associated to a native window. the default is two.
Change-Id: I608b959e6b29d77f95edb23c31dc9b099a758f2f
Mathias Agopian [Fri, 21 May 2010 20:53:28 +0000 (13:53 -0700)]
Merge "fix the threading issue for setBuffercount()" into kraken
Mike Lockwood [Fri, 21 May 2010 19:28:11 +0000 (12:28 -0700)]
Merge "Fix broken Javadoc links" into kraken
Mike Lockwood [Fri, 21 May 2010 19:16:19 +0000 (12:16 -0700)]
Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
Mike Lockwood [Fri, 21 May 2010 18:16:51 +0000 (11:16 -0700)]
Merge "Unhide new location manager APIs:" into kraken
Mike Lockwood [Fri, 21 May 2010 17:37:42 +0000 (10:37 -0700)]
Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
Andreas Huber [Fri, 21 May 2010 15:09:53 +0000 (08:09 -0700)]
Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
Mathias Agopian [Wed, 19 May 2010 00:06:55 +0000 (17:06 -0700)]
fix the threading issue for setBuffercount()
this change introduces R/W locks in the right places.
on the server-side, it guarantees that setBufferCount()
is synchronized with "retire" and "resize".
on the client-side, it guarantees that setBufferCount()
is synchronized with "dequeue", "lockbuffer" and "queue"
Andreas Huber [Thu, 20 May 2010 22:01:07 +0000 (15:01 -0700)]
Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken
James Dong [Thu, 20 May 2010 19:18:39 +0000 (12:18 -0700)]
Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug -
2701282 2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug -
2660974" into kraken
Andreas Huber [Thu, 20 May 2010 18:14:37 +0000 (11:14 -0700)]
am
3c16154a: am
2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '
3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken
* commit '
3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Andreas Huber [Thu, 20 May 2010 18:13:20 +0000 (11:13 -0700)]
am
2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '
2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp
* commit '
2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Andreas Huber [Thu, 20 May 2010 18:11:39 +0000 (11:11 -0700)]
Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Xia Wang [Thu, 20 May 2010 17:58:18 +0000 (10:58 -0700)]
am
3716ea04: am
06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '
3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken
* commit '
3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
If the network SSID is a string, it should be enclosed in double quotation marks.
Xia Wang [Thu, 20 May 2010 17:56:13 +0000 (10:56 -0700)]
am
06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '
069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp
* commit '
069067963cf0117cfb4a1aef99b550b126d9ca92':
If the network SSID is a string, it should be enclosed in double quotation marks.
Wu-cheng Li [Thu, 20 May 2010 08:46:51 +0000 (01:46 -0700)]
Merge "Fix javadoc of camera focus distances API." into kraken
Dirk Dougherty [Thu, 20 May 2010 07:17:14 +0000 (00:17 -0700)]
am
41a254cf: am
dc737ca9: Doc change: Add new tv to carousel.
Merge commit '
41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken
* commit '
41a254cf1b770dded24dcdb2dab6347da6dcf8bf':
Doc change: Add new tv to carousel.
Dirk Dougherty [Thu, 20 May 2010 07:15:41 +0000 (00:15 -0700)]
am
dc737ca9: Doc change: Add new tv to carousel.
Merge commit '
dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp
* commit '
dc737ca986ed9055b4bb39c67d470b6886522ca6':
Doc change: Add new tv to carousel.
Scott Main [Thu, 20 May 2010 03:27:21 +0000 (20:27 -0700)]
am
cf757914: am
55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit '
cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken
* commit '
cf7579148a95b4875b1d5e7430fb8d6f362cefac':
docs: add youtube video to highlights
Scott Main [Thu, 20 May 2010 03:25:15 +0000 (20:25 -0700)]
am
55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit '
55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp
* commit '
55f383a9b8da99aa48857fea27a35badc515d8bd':
docs: add youtube video to highlights
Scott Main [Thu, 20 May 2010 03:24:18 +0000 (20:24 -0700)]
Merge "docs: add youtube video to highlights" into froyo
Scott Main [Thu, 20 May 2010 02:32:25 +0000 (19:32 -0700)]
am
864c3d1b: am
80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '
864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken
* commit '
864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926':
doc: add developing and testing info to backup guide
Scott Main [Thu, 20 May 2010 02:30:29 +0000 (19:30 -0700)]
am
80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '
8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp
* commit '
8025989957e5b6ad51e99a69a0e1e753e40cba67':
doc: add developing and testing info to backup guide
Scott Main [Thu, 20 May 2010 02:29:19 +0000 (19:29 -0700)]
Merge "doc: add developing and testing info to backup guide" into froyo
Dirk Dougherty [Thu, 20 May 2010 01:59:57 +0000 (18:59 -0700)]
am
1eb4a9d8: am
44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
Merge commit '
1eb4a9d8e97252427b785525f17b370b1ea5fe07' into kraken
* commit '
1eb4a9d8e97252427b785525f17b370b1ea5fe07':
Doc change: Move framework api change info higher in platform notes documents.
Dirk Dougherty [Thu, 20 May 2010 01:58:03 +0000 (18:58 -0700)]
am
44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
Merge commit '
44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp
* commit '
44108b54543c87e2c46a6d5d4339b3c4e06373de':
Doc change: Move framework api change info higher in platform notes documents.
Scott Main [Thu, 20 May 2010 01:08:34 +0000 (18:08 -0700)]
am
fa6ee245: am
68728cb3: docs: add 2.2 platform highlights
Merge commit '
fa6ee245c7010101d87194b00f34ea3448053f28' into kraken
* commit '
fa6ee245c7010101d87194b00f34ea3448053f28':
docs: add 2.2 platform highlights
Scott Main [Thu, 20 May 2010 01:06:51 +0000 (18:06 -0700)]
am
68728cb3: docs: add 2.2 platform highlights
Merge commit '
68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp
* commit '
68728cb3b44aba16abc298a37f6110ed00a781dd':
docs: add 2.2 platform highlights
Mathias Agopian [Wed, 19 May 2010 22:11:00 +0000 (15:11 -0700)]
added RWLock C++ wrapper
Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
James Dong [Wed, 19 May 2010 20:14:24 +0000 (13:14 -0700)]
Merge "Initial software encoder checkins" into kraken
Wink Saville [Wed, 19 May 2010 20:05:55 +0000 (13:05 -0700)]
Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken
Scott Main [Wed, 19 May 2010 19:11:03 +0000 (12:11 -0700)]
am
8bf77456: am
8d0e37f5: Merge "docs: revise platform intro" into froyo
Merge commit '
8bf77456cec82cbda3393a4e48f265af1670e795' into kraken
* commit '
8bf77456cec82cbda3393a4e48f265af1670e795':
docs: revise platform intro
Scott Main [Wed, 19 May 2010 19:09:04 +0000 (12:09 -0700)]
am
8d0e37f5: Merge "docs: revise platform intro" into froyo
Merge commit '
8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp
* commit '
8d0e37f5b142623b41b78ce5d19b4b650d53eb7f':
docs: revise platform intro
Scott Main [Wed, 19 May 2010 19:05:52 +0000 (12:05 -0700)]
Merge "docs: revise platform intro" into froyo
The Android Open Source Project [Wed, 19 May 2010 16:43:20 +0000 (09:43 -0700)]
am
ee1cdd0e: merge from open-source master
Merge commit '
ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken
* commit '
ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
Don't allow invalid Uris to be added as observers.
The Android Open Source Project [Wed, 19 May 2010 16:37:21 +0000 (09:37 -0700)]
am
2b544c9f: merge from open-source master
Merge commit '
2b544c9f0ea139d052664be0be465c2315707081' into kraken
* commit '
2b544c9f0ea139d052664be0be465c2315707081':
Fix isssue
2548710: Native AudioTrack resources never freed.
The Android Open Source Project [Wed, 19 May 2010 16:36:55 +0000 (09:36 -0700)]
merge from open-source master
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
The Android Open Source Project [Wed, 19 May 2010 16:32:44 +0000 (09:32 -0700)]
merge from open-source master
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
The Android Open Source Project [Wed, 19 May 2010 16:22:21 +0000 (09:22 -0700)]
am
2dc7c6c4: merge from open-source master
Merge commit '
2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken
* commit '
2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
Add and document .nomedia constant for MediaStore (Issue 6365)
The Android Open Source Project [Wed, 19 May 2010 16:20:22 +0000 (09:20 -0700)]
merge from open-source master
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
Romain Guy [Wed, 19 May 2010 16:03:57 +0000 (09:03 -0700)]
Merge "Don't allow invalid Uris to be added as observers."
The Android Open Source Project [Wed, 19 May 2010 15:41:26 +0000 (08:41 -0700)]
am
faf9a783: merge from open-source master
Merge commit '
faf9a78363b0c773b95c9b43263d788aee313054' into kraken
* commit '
faf9a78363b0c773b95c9b43263d788aee313054':
Text disappears when selecting text in text editor.
The Android Open Source Project [Wed, 19 May 2010 15:39:13 +0000 (08:39 -0700)]
merge from open-source master
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
Jean-Baptiste Queru [Wed, 19 May 2010 15:35:21 +0000 (08:35 -0700)]
Merge "Fix isssue
2548710: Native AudioTrack resources never freed."
The Android Open Source Project [Wed, 19 May 2010 15:33:27 +0000 (08:33 -0700)]
am
d6c0bb0f: merge from open-source master
Merge commit '
d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken
* commit '
d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
Removed Calls to deprecated APIs
The Android Open Source Project [Wed, 19 May 2010 15:28:32 +0000 (08:28 -0700)]
merge from open-source master
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
The Android Open Source Project [Wed, 19 May 2010 15:21:54 +0000 (08:21 -0700)]
am
aa2fe148: merge from open-source master
Merge commit '
aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken
* commit '
aa2fe148496858e17d0ffd2b8d5d29b89d400934':
Improved error handling when font loading fails.
The Android Open Source Project [Wed, 19 May 2010 15:15:54 +0000 (08:15 -0700)]
merge from open-source master
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
Romain Guy [Wed, 19 May 2010 07:03:34 +0000 (00:03 -0700)]
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
Romain Guy [Wed, 19 May 2010 07:01:55 +0000 (00:01 -0700)]
Merge "Text disappears when selecting text in text editor."
Romain Guy [Wed, 19 May 2010 07:01:02 +0000 (00:01 -0700)]
Merge "Removed Calls to deprecated APIs"
Romain Guy [Wed, 19 May 2010 06:51:16 +0000 (23:51 -0700)]
Merge "Improved error handling when font loading fails."
Guang Zhu [Wed, 19 May 2010 01:33:35 +0000 (18:33 -0700)]
Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken
Guang Zhu [Wed, 19 May 2010 01:33:30 +0000 (18:33 -0700)]
Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken
Suchi Amalapurapu [Tue, 18 May 2010 21:55:48 +0000 (14:55 -0700)]
am
7361b741: am
4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Merge commit '
7361b7410f2427022cc8917b00553dc26107cded' into kraken
* commit '
7361b7410f2427022cc8917b00553dc26107cded':
Uncomment a test that was marked as STOPSHIP
Jaikumar Ganesh [Tue, 18 May 2010 21:53:39 +0000 (14:53 -0700)]
am
ea6f6755: am
ef95aceb: Merge "Removing STOPSHIP logs." into froyo
Merge commit '
ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken
* commit '
ea6f6755ce15133238938bd9626b69e5f655a49c':
Removing STOPSHIP logs.
Suchi Amalapurapu [Tue, 18 May 2010 21:53:37 +0000 (14:53 -0700)]
am
4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Merge commit '
4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '
4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
Suchi Amalapurapu [Tue, 18 May 2010 21:51:55 +0000 (14:51 -0700)]
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Jaikumar Ganesh [Tue, 18 May 2010 21:51:40 +0000 (14:51 -0700)]
am
ef95aceb: Merge "Removing STOPSHIP logs." into froyo
Merge commit '
ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp
* commit '
ef95acebdc44a7cf2990c4302850fcb112b695d2':
Removing STOPSHIP logs.
Jaikumar Ganesh [Tue, 18 May 2010 21:48:05 +0000 (14:48 -0700)]
Merge "Removing STOPSHIP logs." into froyo
Eric Laurent [Wed, 31 Mar 2010 19:21:17 +0000 (12:21 -0700)]
Fix isssue
2548710: Native AudioTrack resources never freed.
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: Iaa78a91e78d27f5c982218cc55e81702f1610ab2
Suchi Amalapurapu [Tue, 18 May 2010 20:17:58 +0000 (13:17 -0700)]
am
aa4db173: am
9a212adc: Fix
2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
Merge commit '
aa4db173a2465d74ea35cc7f736f6b2a5b01f72c' into kraken
* commit '
aa4db173a2465d74ea35cc7f736f6b2a5b01f72c':
Fix
2641875
Suchi Amalapurapu [Tue, 18 May 2010 20:16:13 +0000 (13:16 -0700)]
am
9a212adc: Fix
2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
Merge commit '
9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp
* commit '
9a212adcffbc4b32d51f512889b33ba584647aa9':
Fix
2641875
The Android Open Source Project [Tue, 18 May 2010 19:49:01 +0000 (12:49 -0700)]
am
3aecdb9d: merge from open-source master
Merge commit '
3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken
* commit '
3aecdb9d7e92b1a91860600feefb5c0062b652cf':
fix build
Fix some typos and other cosmetic cleanups in telephony framework.
The Android Open Source Project [Tue, 18 May 2010 19:47:02 +0000 (12:47 -0700)]
merge from open-source master
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
Dianne Hackborn [Tue, 18 May 2010 19:21:26 +0000 (12:21 -0700)]
Merge "Add new API to take over a window's Surface." into kraken
The Android Open Source Project [Tue, 18 May 2010 18:17:01 +0000 (11:17 -0700)]
am
5ccb8b8c: merge from open-source master
Merge commit '
5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken
* commit '
5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
Fix updating and deleting FDN entries with an empty alpha identifier.
Abort FDN delete when number is empty (instead of name)
The Android Open Source Project [Tue, 18 May 2010 18:08:12 +0000 (11:08 -0700)]
merge from open-source master
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
Jean-Baptiste Queru [Tue, 18 May 2010 17:34:42 +0000 (10:34 -0700)]
Merge "Fix some typos and other cosmetic cleanups in telephony framework."
Jean-Baptiste Queru [Tue, 18 May 2010 17:14:14 +0000 (10:14 -0700)]
Merge "Abort FDN delete when number is empty (instead of name)"
The Android Open Source Project [Tue, 18 May 2010 16:21:28 +0000 (09:21 -0700)]
am
4547e528: merge from open-source master
Merge commit '
4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken
* commit '
4547e5284e79192373f3a6bb6c452501171bc1d6':
Removed Calls to deprecated APIs and unused Imports
The Android Open Source Project [Tue, 18 May 2010 16:18:37 +0000 (09:18 -0700)]
merge from open-source master
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
Scott Main [Tue, 18 May 2010 16:07:39 +0000 (09:07 -0700)]
am
74e151c5: am
5f1d1002: Merge "docs: fix markup error" into froyo
Merge commit '
74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken
* commit '
74e151c54c31cf7324771fcabc06e9fbfe1118ca':
docs: fix markup error
Scott Main [Tue, 18 May 2010 16:02:09 +0000 (09:02 -0700)]
am
5f1d1002: Merge "docs: fix markup error" into froyo
Merge commit '
5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp
* commit '
5f1d100298dfafbd996b6deff457e6d1de4008a0':
docs: fix markup error
Scott Main [Tue, 18 May 2010 15:59:03 +0000 (08:59 -0700)]
Merge "docs: fix markup error" into froyo
Mathias Agopian [Tue, 18 May 2010 03:10:24 +0000 (20:10 -0700)]
Merge "add a few tests to SharedBufferStackTest" into kraken
Mathias Agopian [Tue, 18 May 2010 03:08:22 +0000 (20:08 -0700)]
add a few tests to SharedBufferStackTest
Change-Id: I1c46c07aa1483aee4d4ebd8745638a2c462cc1b3
Mathias Agopian [Tue, 18 May 2010 01:57:46 +0000 (18:57 -0700)]
Merge "improve SharedBufferStack test" into kraken
Mathias Agopian [Tue, 18 May 2010 01:56:10 +0000 (18:56 -0700)]
improve SharedBufferStack test
Change-Id: I32683bfe0916918757280db89113595867acd5a7
Mathias Agopian [Tue, 18 May 2010 01:55:47 +0000 (18:55 -0700)]
Merge "fix a bug where queueBuffer() would fail after the SharedbufferStack is resized" into kraken
Mathias Agopian [Tue, 18 May 2010 01:54:19 +0000 (18:54 -0700)]
fix a bug where queueBuffer() would fail after the SharedbufferStack is resized
Change-Id: I12bf13a62018ce1349bab7be0b0cad7fad13fee8
Scott Main [Tue, 18 May 2010 01:04:07 +0000 (18:04 -0700)]
am
fbb285e6: am
e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Merge commit '
fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken
* commit '
fbb285e67f6b150440647d0c484d88edb7bf9be9':
docs: revise webview description and add info for targeting screen densities
Scott Main [Tue, 18 May 2010 01:01:28 +0000 (18:01 -0700)]
am
e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Merge commit '
e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp
* commit '
e64256d610ec5ea3df5db8a24333a6ce98b83d49':
docs: revise webview description and add info for targeting screen densities
Scott Main [Tue, 18 May 2010 00:59:37 +0000 (17:59 -0700)]
Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Dirk Dougherty [Tue, 18 May 2010 00:40:09 +0000 (17:40 -0700)]
am
b2fa79e3: am
6750bb7f: Doc change: add link to source.android.com
Merge commit '
b2fa79e3723b448114181fef983deaae97b44161' into kraken
* commit '
b2fa79e3723b448114181fef983deaae97b44161':
Doc change: add link to source.android.com
OSDN Git Service
