OSDN Git Service
James Dong [Tue, 4 May 2010 21:52:57 +0000 (14:52 -0700)]
am
8d30b2d2: Merge "Support AAC recording" into kraken
Andreas Huber [Tue, 4 May 2010 21:52:47 +0000 (14:52 -0700)]
am
ce0bd717: am
8ea45aad: am
e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
Scott Main [Tue, 4 May 2010 21:52:43 +0000 (14:52 -0700)]
am
ebad36db: am
5c16039a: am
01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
James Dong [Tue, 4 May 2010 21:40:28 +0000 (14:40 -0700)]
Merge "Support AAC recording" into kraken
Andreas Huber [Tue, 4 May 2010 21:30:34 +0000 (14:30 -0700)]
am
8ea45aad: am
e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
Merge commit '
8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken
* commit '
8ea45aad100ee25067b2e83703454c71a968ba4f':
Support for Ogg Vorbis decoding in stagefright.
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:22:47 +0000 (14:22 -0700)]
am
5c16039a: am
01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '
5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken
* commit '
5c16039adfe3da2d9438b8814734f5c8d2570ad3':
docs: revise and add documentation for backup APIs
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:55:03 +0000 (12:55 -0700)]
am
f24e66db: am
342a3800: am
70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Dan Morrill [Tue, 4 May 2010 19:54:58 +0000 (12:54 -0700)]
am
6a22fb9b: am
f7ebcfec: am
e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Joe Onorato [Tue, 4 May 2010 19:54:54 +0000 (12:54 -0700)]
am
07779ac1: am
77da7312: am
f140be6c: Call into app widget hosts when the provider is updated.
Daniel Sandler [Tue, 4 May 2010 19:45:53 +0000 (12:45 -0700)]
am
342a3800: am
70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '
342a3800b9b31929b337d298a24184d820f27f26' into kraken
* commit '
342a3800b9b31929b337d298a24184d820f27f26':
Increase the row height of menus by 1dip.
Dan Morrill [Tue, 4 May 2010 19:45:49 +0000 (12:45 -0700)]
am
f7ebcfec: am
e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Merge commit '
f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken
* commit '
f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
Adding the backward-compatible filtering heuristics for the new device
Joe Onorato [Tue, 4 May 2010 19:45:44 +0000 (12:45 -0700)]
am
77da7312: am
f140be6c: Call into app widget hosts when the provider is updated.
Merge commit '
77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken
* commit '
77da7312215c4a433e3f53c2fe306307fc3bad52':
Call into app widget hosts when the provider is updated.
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:29:27 +0000 (09:29 -0700)]
am
e4b9834f: am
6de3a6fd: merge from open-source master
The Android Open Source Project [Tue, 4 May 2010 16:27:35 +0000 (09:27 -0700)]
am
6de3a6fd: merge from open-source master
Merge commit '
6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken
* commit '
6de3a6fdd303b15ad944570daf37faa798dc1989':
Fix typo of <p> end tag in appwidgets.xml
The Android Open Source Project [Tue, 4 May 2010 16:20:16 +0000 (09:20 -0700)]
merge from open-source master
Change-Id: I5f552b45caae639170674213c23f154437b58afd
The Android Open Source Project [Mon, 3 May 2010 23:26:53 +0000 (16:26 -0700)]
am
dcb5f18f: am
007ad770: merge from open-source master
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:25:15 +0000 (16:25 -0700)]
am
007ad770: merge from open-source master
Merge commit '
007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken
* commit '
007ad7700a23ff7e618cfeee1eab97063c93b800':
Adapt to new location of libcore
Parse custom text header and ignore it.
Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
'uses-library' was not working for persistent applications.
Fix an NPE in InputMethodService when mExtractAction is null.
The Android Open Source Project [Mon, 3 May 2010 23:19:19 +0000 (16:19 -0700)]
merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
Jean-Baptiste Queru [Sun, 2 May 2010 23:15:26 +0000 (16:15 -0700)]
am
05bcf755: am
2529d4ea: Adapt to new location of libcore
Jean-Baptiste Queru [Sun, 2 May 2010 23:11:32 +0000 (16:11 -0700)]
am
2529d4ea: Adapt to new location of libcore
Merge commit '
2529d4eab80778aef9c7a9fe27712a41686d22c4' into kraken
* commit '
2529d4eab80778aef9c7a9fe27712a41686d22c4':
Adapt to new location of libcore
Xia Wang [Fri, 30 Apr 2010 22:50:25 +0000 (15:50 -0700)]
am
7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken
Xia Wang [Fri, 30 Apr 2010 22:49:23 +0000 (15:49 -0700)]
Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken
Jean-Baptiste Queru [Fri, 30 Apr 2010 20:20:48 +0000 (13:20 -0700)]
am
5b559e81: Adapt to new location of libcore
Mathias Agopian [Fri, 30 Apr 2010 20:08:41 +0000 (13:08 -0700)]
am
3b91e13e: make sure the server-side validates pointers/indices visible on the client side
Mathias Agopian [Fri, 30 Apr 2010 19:59:21 +0000 (12:59 -0700)]
make sure the server-side validates pointers/indices visible on the client side
Change-Id: I604f58d3fcd2d09ec7998123c627401081345cd6
Jean-Baptiste Queru [Fri, 30 Apr 2010 20:05:18 +0000 (13:05 -0700)]
Merge "Adapt to new location of libcore" into kraken-plus-aosp
Mathias Agopian [Fri, 30 Apr 2010 19:58:11 +0000 (12:58 -0700)]
Merge "Add support for enqueuing buffers in arbitrary order" into kraken
Daniel Sandler [Fri, 30 Apr 2010 18:34:03 +0000 (11:34 -0700)]
am
d47cdbb7: am
3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
Merge commit '
d47cdbb7ea97a6ed3b428d913fa45883904d0ba8' into kraken
* commit '
d47cdbb7ea97a6ed3b428d913fa45883904d0ba8':
Tweak style of recent apps dialog title.
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:24:25 +0000 (21:24 -0700)]
am
27963bbc: am
cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit '
27963bbc25278885f57965f6bf8250d6eeabd94a' into kraken
* commit '
27963bbc25278885f57965f6bf8250d6eeabd94a':
docs: editorial revisions to the bmgr tool doc
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
Dianne Hackborn [Fri, 30 Apr 2010 00:59:17 +0000 (17:59 -0700)]
Merge "Fix build." into kraken
Marc Blank [Thu, 29 Apr 2010 23:28:50 +0000 (16:28 -0700)]
am
9ca81664: am
794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '
9ca816649bd2af7d540f375be8fcc503c50aef72' into kraken
* commit '
9ca816649bd2af7d540f375be8fcc503c50aef72':
Expose _id in ExtendedProperties subValues
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:31:23 +0000 (15:31 -0700)]
am
48399e38: am
77a1beb1: Merge "Import revised translations" into froyo
Merge commit '
48399e38c978a66ac4c6054c8681a246dfc94b4b' into kraken
* commit '
48399e38c978a66ac4c6054c8681a246dfc94b4b':
Import revised translations
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:25:31 +0000 (15:25 -0700)]
am
1d328033: am
764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '
1d328033277aef352a80f06f3520a86cbdc9c48f' into kraken
* commit '
1d328033277aef352a80f06f3520a86cbdc9c48f':
docs: rewrite information about using shared preferences, internal and
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
Mathias Agopian [Thu, 29 Apr 2010 21:17:12 +0000 (14:17 -0700)]
Merge "cleanup. waitForCondition() now uses polymorphsim instead of templtes" into kraken
Mathias Agopian [Thu, 29 Apr 2010 21:16:14 +0000 (14:16 -0700)]
Merge "fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly." into kraken
Dianne Hackborn [Thu, 29 Apr 2010 19:22:52 +0000 (12:22 -0700)]
am
d8f34720: am
c956f375: Fix issue #
2641875: Apps on sdcard not accesible after update
Merge commit '
d8f34720a1eb87770c854928410c753e0969d3ac' into kraken
* commit '
d8f34720a1eb87770c854928410c753e0969d3ac':
Fix issue #
2641875: Apps on sdcard not accesible after update
Dianne Hackborn [Thu, 29 Apr 2010 19:20:42 +0000 (12:20 -0700)]
am
c956f375: Fix issue #
2641875: Apps on sdcard not accesible after update
Merge commit '
c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp
* commit '
c956f37567593a71271bae107eafec47575f7dcc':
Fix issue #
2641875: Apps on sdcard not accesible after update
Jean-Baptiste Queru [Thu, 29 Apr 2010 17:03:40 +0000 (10:03 -0700)]
Merge "Fix an NPE in InputMethodService when mExtractAction is null."
Adam Powell [Thu, 29 Apr 2010 02:38:41 +0000 (19:38 -0700)]
am
6483f6d5: am
b40c42f1: Fix bug
2639949 - Don\'t stop a Scroller early
Merge commit '
6483f6d546655a9579670b42d445614cab609e28' into kraken
* commit '
6483f6d546655a9579670b42d445614cab609e28':
Fix bug
2639949 - Don't stop a Scroller early
Adam Powell [Thu, 29 Apr 2010 02:34:49 +0000 (19:34 -0700)]
am
b40c42f1: Fix bug
2639949 - Don\'t stop a Scroller early
Merge commit '
b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp
* commit '
b40c42f1ffa124cfbd5152007491c1d0b065592d':
Fix bug
2639949 - Don't stop a Scroller early
Dianne Hackborn [Sat, 24 Apr 2010 00:51:26 +0000 (17:51 -0700)]
New xlarge screen size.
Not complete, only for experimentation at this point.
This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.
The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.
Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
Mathias Agopian [Wed, 28 Apr 2010 04:08:20 +0000 (21:08 -0700)]
Add support for enqueuing buffers in arbitrary order
Also added a very simple SharedBufferStack unit test.
Change-Id: I253dbbe98a53c966b78d22d4d6dd59f8aefc8c40
Mathias Agopian [Tue, 27 Apr 2010 23:41:19 +0000 (16:41 -0700)]
cleanup. waitForCondition() now uses polymorphsim instead of templtes
the reason for the above change is that waitForCondition() had become
large over time, mainly to handle error cases, using inlines to
evaluate the condition doesn't buys us much anymore while it increases
code size.
Change-Id: I2595d850832628954b900ab8bb1796c863447bc7
Mathias Agopian [Tue, 27 Apr 2010 23:11:38 +0000 (16:11 -0700)]
fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly.
in the undoDequeue() case, 'tail' was recalculated from 'available' and 'head'
however there was a race between this and retireAndLock(), which could cause
'tail' to be recalculated wrongly.
the interesting thing though is that retireAndLock() shouldn't have any impact
on the value of 'tail', which is client-side only attribute.
we fix the race by saving the value of 'tail' before dequeue() and restore it
in the case of undoDequeue(), since we know it doesn't depend on retireAndLock().
Change-Id: I4bcc4d16b6bc4dd93717ee739c603040b18295a0
Steve Howard [Wed, 28 Apr 2010 23:07:18 +0000 (16:07 -0700)]
am
3b20c9e8: am
81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '
3b20c9e80533401d8c423977ef86460d789d4e1e' into kraken
* commit '
3b20c9e80533401d8c423977ef86460d789d4e1e':
Fix a minor bug in transitions to left-edge-up landscape.
Steve Howard [Wed, 28 Apr 2010 23:03:28 +0000 (16:03 -0700)]
am
81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '
81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp
* commit '
81ac367be66905a5b53b8e7e98160546802bd98b':
Fix a minor bug in transitions to left-edge-up landscape.
Steve Howard [Wed, 28 Apr 2010 22:59:39 +0000 (15:59 -0700)]
Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
The Android Open Source Project [Wed, 28 Apr 2010 22:54:35 +0000 (15:54 -0700)]
The Android Open Source Project [Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)]
merge from open-source master
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
Vasu Nori [Wed, 28 Apr 2010 22:42:23 +0000 (15:42 -0700)]
am
91a62f3d: am
a07c4cbe: Merge "bug:
2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
Merge commit '
91a62f3d4a6b4f92c694d09e991fc6f82701fc47' into kraken
* commit '
91a62f3d4a6b4f92c694d09e991fc6f82701fc47':
bug:
2622719 move 'forcing of cursor execution' to ContentProvider
Vasu Nori [Wed, 28 Apr 2010 22:38:44 +0000 (15:38 -0700)]
am
a07c4cbe: Merge "bug:
2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
Merge commit '
a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp
* commit '
a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
bug:
2622719 move 'forcing of cursor execution' to ContentProvider
Vasu Nori [Wed, 28 Apr 2010 22:35:57 +0000 (15:35 -0700)]
Merge "bug:
2622719 move 'forcing of cursor execution' to ContentProvider" into froyo
Amith Yamasani [Wed, 28 Apr 2010 22:25:05 +0000 (15:25 -0700)]
am
087b25f7: am
6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681" into froyo
Merge commit '
087b25f7e2669497cf217d873437e8726c139abd' into kraken
* commit '
087b25f7e2669497cf217d873437e8726c139abd':
Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681
Amith Yamasani [Wed, 28 Apr 2010 22:21:37 +0000 (15:21 -0700)]
am
6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681" into froyo
Merge commit '
6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp
* commit '
6e4895b63aa64a8df64dd69c49a414b7566932d3':
Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681
Amith Yamasani [Wed, 28 Apr 2010 22:18:15 +0000 (15:18 -0700)]
Merge "Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681" into froyo
Fred Quintana [Wed, 28 Apr 2010 21:18:19 +0000 (14:18 -0700)]
am
00b92b94: am
9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '
00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken
* commit '
00b92b943ff397cb7f7c4827a0eea9df7aa22071':
revert a change in the SyncManager that caused it to not cancel
Fred Quintana [Wed, 28 Apr 2010 21:13:55 +0000 (14:13 -0700)]
am
9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '
9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp
* commit '
9aaf24f2a46eacd1e342f8c0300c3093646e2814':
revert a change in the SyncManager that caused it to not cancel
Fred Quintana [Wed, 28 Apr 2010 21:10:05 +0000 (14:10 -0700)]
Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Dianne Hackborn [Wed, 28 Apr 2010 20:19:25 +0000 (13:19 -0700)]
am
725f731c: am
bc5a0328: Merge "Fix issue #
2569139: Sapphire user cannot login to last.fm..." into froyo
Merge commit '
725f731cb9368f52a0c6664d2961ef4340c8f7a0' into kraken
* commit '
725f731cb9368f52a0c6664d2961ef4340c8f7a0':
Fix issue #
2569139: Sapphire user cannot login to last.fm...
Dianne Hackborn [Wed, 28 Apr 2010 20:14:43 +0000 (13:14 -0700)]
am
bc5a0328: Merge "Fix issue #
2569139: Sapphire user cannot login to last.fm..." into froyo
Merge commit '
bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp
* commit '
bc5a03286a72dc3627cee313d473178f5a123049':
Fix issue #
2569139: Sapphire user cannot login to last.fm...
Dianne Hackborn [Wed, 28 Apr 2010 19:42:00 +0000 (12:42 -0700)]
Merge "Fix issue #
2569139: Sapphire user cannot login to last.fm..." into froyo
James Dong [Wed, 28 Apr 2010 19:03:55 +0000 (12:03 -0700)]
Merge "Use timestamp from camera driver for CameraSource" into kraken
James Dong [Tue, 27 Apr 2010 00:48:26 +0000 (17:48 -0700)]
Use timestamp from camera driver for CameraSource
Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
Kenny Root [Wed, 28 Apr 2010 16:47:27 +0000 (09:47 -0700)]
am
9fe55514: am
4bba2149: Merge "Import revised translations" into froyo
Merge commit '
9fe55514524993936eafe9e77e3dd98ba17a78b6' into kraken
* commit '
9fe55514524993936eafe9e77e3dd98ba17a78b6':
Import revised translations
Scott Main [Wed, 28 Apr 2010 16:47:19 +0000 (09:47 -0700)]
am
ca54674c: am
eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE
Merge commit '
ca54674c656b5cf66cfeda42ef7a640971618f2a' into kraken
* commit '
ca54674c656b5cf66cfeda42ef7a640971618f2a':
docs: update information about developing on a device.
Kenny Root [Wed, 28 Apr 2010 16:32:55 +0000 (09:32 -0700)]
am
4bba2149: Merge "Import revised translations" into froyo
Merge commit '
4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp
* commit '
4bba2149f3f2709b24dc40118461c5d683ed6965':
Import revised translations
Scott Main [Wed, 28 Apr 2010 16:31:28 +0000 (09:31 -0700)]
am
eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to sp
Merge commit '
eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9' into froyo-plus-aosp
* commit '
eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9':
docs: update information about developing on a device.
Kenny Root [Wed, 28 Apr 2010 15:05:03 +0000 (08:05 -0700)]
Merge "Import revised translations" into froyo
Scott Main [Wed, 28 Apr 2010 01:35:53 +0000 (18:35 -0700)]
Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to specifically describe using a device and make both docs more consistent with each other." into froyo
Vasu Nori [Tue, 27 Apr 2010 23:53:16 +0000 (16:53 -0700)]
am
785c8983: am
996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '
785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken
* commit '
785c89835741ca735fbb766bc2e1aeb68a4d5169':
remove myname accidentally included in one of the files
Vasu Nori [Tue, 27 Apr 2010 23:49:29 +0000 (16:49 -0700)]
am
996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '
996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp
* commit '
996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
remove myname accidentally included in one of the files
Dianne Hackborn [Tue, 27 Apr 2010 23:45:19 +0000 (16:45 -0700)]
am
048b40eb: am
e367896e: Merge "Fix issue #
2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
Merge commit '
048b40ebdc980906193cfcb66274e2a1f3ec6093' into kraken
* commit '
048b40ebdc980906193cfcb66274e2a1f3ec6093':
Fix issue #
2594388: WallpaperService doesn't always call onSurfaceDestroyed()
Vasu Nori [Tue, 27 Apr 2010 23:44:58 +0000 (16:44 -0700)]
Merge "remove myname accidentally included in one of the files" into froyo
Dianne Hackborn [Tue, 27 Apr 2010 23:42:42 +0000 (16:42 -0700)]
am
e367896e: Merge "Fix issue #
2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
Merge commit '
e367896e91a0d75250f00f2de3929495595719d4' into froyo-plus-aosp
* commit '
e367896e91a0d75250f00f2de3929495595719d4':
Fix issue #
2594388: WallpaperService doesn't always call onSurfaceDestroyed()
Dianne Hackborn [Tue, 27 Apr 2010 23:39:44 +0000 (16:39 -0700)]
Merge "Fix issue #
2594388: WallpaperService doesn't always call onSurfaceDestroyed()" into froyo
Shimeng (Simon) Wang [Tue, 27 Apr 2010 19:37:41 +0000 (12:37 -0700)]
am
447beb52: am
05fd7e7d: Add good international characters to the path part of Url pattern.
Merge commit '
447beb52be8f97154db2273b4130fd83bf34d840' into kraken
* commit '
447beb52be8f97154db2273b4130fd83bf34d840':
Add good international characters to the path part of Url pattern.
Shimeng (Simon) Wang [Tue, 27 Apr 2010 19:34:03 +0000 (12:34 -0700)]
am
05fd7e7d: Add good international characters to the path part of Url pattern.
Merge commit '
05fd7e7d328261260a348c0b6ba840bc1f60cb14' into froyo-plus-aosp
* commit '
05fd7e7d328261260a348c0b6ba840bc1f60cb14':
Add good international characters to the path part of Url pattern.
Adam Powell [Tue, 27 Apr 2010 19:11:04 +0000 (12:11 -0700)]
am
b40cfc16: am
2ea21a84: Merge "Fix a WebView scrolling regression - bug
2633572." into froyo
Merge commit '
b40cfc162fc473aece63f449eaa1dd643d24b9c0' into kraken
* commit '
b40cfc162fc473aece63f449eaa1dd643d24b9c0':
Fix a WebView scrolling regression - bug
2633572.
Adam Powell [Tue, 27 Apr 2010 19:08:01 +0000 (12:08 -0700)]
am
2ea21a84: Merge "Fix a WebView scrolling regression - bug
2633572." into froyo
Merge commit '
2ea21a84ef81849153f30bbea213acd5be110c08' into froyo-plus-aosp
* commit '
2ea21a84ef81849153f30bbea213acd5be110c08':
Fix a WebView scrolling regression - bug
2633572.
Adam Powell [Tue, 27 Apr 2010 19:05:40 +0000 (12:05 -0700)]
Merge "Fix a WebView scrolling regression - bug
2633572." into froyo