Patrick Scott
6aa83d7665
am 36acfbc2: Add a bulk request method for bookmark icons.
...
Merge commit '36acfbc2b8df6e62f2d583933eca3a49265279a6' into froyo-plus-aosp
* commit '36acfbc2b8df6e62f2d583933eca3a49265279a6':
Add a bulk request method for bookmark icons.
2010-04-12 11:53:09 -07:00
Fabrice Di Meglio
4ffad344dd
Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)"
2010-04-12 11:42:20 -07:00
Andreas Huber
49e567f537
am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
...
Merge commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293' into kraken
* commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
2010-04-12 11:07:54 -07:00
Andreas Huber
bbf1085cd2
am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
...
Merge commit '1d7a8b448e9371685894b6b02d29bcd3ae959545' into froyo-plus-aosp
* commit '1d7a8b448e9371685894b6b02d29bcd3ae959545':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
2010-04-12 11:05:36 -07:00
Andreas Huber
2f16b634d0
Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken
2010-04-12 11:05:22 -07:00
Andreas Huber
ddd6d87bde
Merge "Remove unnecessary lock from AMRWriter." into kraken
2010-04-12 11:05:09 -07:00
Andreas Huber
9acdf61fbb
Merge "Various fixes to enable recording on passion and nexus1." into kraken
2010-04-12 11:04:57 -07:00
Andreas Huber
16c57d0da1
Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken
2010-04-12 11:04:46 -07:00
Andreas Huber
128cbf2812
Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
2010-04-12 11:02:27 -07:00
Andreas Huber
e364a2acbe
am 10d40772: am cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
...
Merge commit '10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0' into kraken
* commit '10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0':
Ignore corrupt aac audio frames and substitute silence.
2010-04-12 10:16:11 -07:00
Andreas Huber
1d00c7910b
am b1e7bee2: am 040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
...
Merge commit 'b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4' into kraken
* commit 'b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4':
Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
2010-04-12 10:16:08 -07:00
Andreas Huber
d073b6b210
am cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
...
Merge commit 'cdded187d20bdc6379c5a09bdd2002fa070b745d' into froyo-plus-aosp
* commit 'cdded187d20bdc6379c5a09bdd2002fa070b745d':
Ignore corrupt aac audio frames and substitute silence.
2010-04-12 10:14:08 -07:00
Andreas Huber
8a503c1d4c
am 040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
...
Merge commit '040301cad17e447d760e7b7e54b79c8c294415ea' into froyo-plus-aosp
* commit '040301cad17e447d760e7b7e54b79c8c294415ea':
Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
2010-04-12 10:12:29 -07:00
Andreas Huber
66143c02c1
Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
2010-04-12 10:11:32 -07:00
Leon Scroggins
844bb8abb1
am 6636ff18: am fac110dc: am 853a4240: am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
2010-04-12 08:20:23 -07:00
Leon Scroggins
f701b0d09c
am fac110dc: am 853a4240: am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
2010-04-12 08:17:38 -07:00
Leon Scroggins
2c2fc704a8
am 853a4240: am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
...
Merge commit '853a42409b34b3aff118c7a09e390477247d002b' into kraken
* commit '853a42409b34b3aff118c7a09e390477247d002b':
Do not check mWebTextView's focus state to determine editing mode.
2010-04-12 08:14:35 -07:00
Leon Scroggins
8214e0ee23
am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
...
Merge commit '63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp
* commit '63284ede623ca8a4119f1f44b86fbf017faba8dc':
Do not check mWebTextView's focus state to determine editing mode.
2010-04-12 08:11:40 -07:00
Wu-cheng Li
bef8a773cc
am 76fc56fb: am 926d9a89: am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
2010-04-10 11:59:48 -07:00
Scott Main
aa4112a77c
am f63d616b: am 8e60e092: am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
2010-04-10 11:59:44 -07:00
Dianne Hackborn
f9a4f79467
am 7c48d939: am e1b462d7: am 06af7620: am 17de1532: Merge "Fix issue #2581524 : Car home icon should always go to car home" into froyo
2010-04-10 11:59:31 -07:00
Robert Greenwalt
f5a6470ca8
am 890a53c9: am 6890bfba: am 52ebff3c: am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo
2010-04-10 11:59:25 -07:00
Yu Shan Emily Lau
fbafd3d2d9
am 5b1b4993: am 45c566e9: am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
2010-04-10 11:59:21 -07:00
Romain Guy
073426f5dd
am aa03df8a: am 50e0d9ae: am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646 " into froyo
2010-04-10 11:59:16 -07:00
Wink Saville
6bf29d8441
am d5f8da30: am 472ba185: am 19fe70cb: am a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
2010-04-10 11:59:11 -07:00
Wei Huang
4cc79c0bf2
am 235af299: am 92671e5e: am 997b3803: am c621b65d: Merge "bug #2542580 : add the appropriate mdpi asset for chat icon." into froyo
2010-04-10 11:59:03 -07:00
Jesse Wilson
d178c8ad20
am 97a22e1b: am 86b0276a: am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
2010-04-10 11:58:52 -07:00
Mike Reed
8f995cb208
am 1e5b95ad: am 1064a131: am 58d50183: am a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo
2010-04-10 11:58:46 -07:00
Robert Greenwalt
d0534239b6
am b049ab29: am 82052192: am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
2010-04-10 11:58:40 -07:00
Dan Egnor
87f0192f87
am ca39b95d: am aeeea3da: am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
2010-04-10 11:58:33 -07:00
Kristian Monsen
a772fa79cc
am 2843b0e3: am 53f772ed: am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
2010-04-10 11:58:26 -07:00
Grace Kloba
85c790b16d
am 6fd14242: am 449491ce: am 210462e5: am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message
2010-04-10 11:58:19 -07:00
Wu-cheng Li
2cdea607bd
am 926d9a89: am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
2010-04-10 11:55:00 -07:00
Scott Main
0227df0a81
am 8e60e092: am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
2010-04-10 11:54:56 -07:00
Dianne Hackborn
e0899b63e0
am e1b462d7: am 06af7620: am 17de1532: Merge "Fix issue #2581524 : Car home icon should always go to car home" into froyo
2010-04-10 11:54:51 -07:00
Robert Greenwalt
fc3d8b088c
am 6890bfba: am 52ebff3c: am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo
2010-04-10 11:54:47 -07:00
Yu Shan Emily Lau
e570d07a0e
am 45c566e9: am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
2010-04-10 11:54:42 -07:00
Romain Guy
223dd73ef1
am 50e0d9ae: am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646 " into froyo
2010-04-10 11:54:36 -07:00
Wink Saville
789d8f3aae
am 472ba185: am 19fe70cb: am a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
2010-04-10 11:54:30 -07:00
Wei Huang
156538aba9
am 92671e5e: am 997b3803: am c621b65d: Merge "bug #2542580 : add the appropriate mdpi asset for chat icon." into froyo
2010-04-10 11:54:25 -07:00
Jesse Wilson
fc66557cc3
am 86b0276a: am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
2010-04-10 11:54:19 -07:00
Mike Reed
ba88ef1a5b
am 1064a131: am 58d50183: am a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo
2010-04-10 11:54:13 -07:00
Robert Greenwalt
79d072aec8
am 82052192: am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
2010-04-10 11:54:05 -07:00
Dan Egnor
283b41760c
am aeeea3da: am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
2010-04-10 11:53:59 -07:00
Kristian Monsen
0e3372e9c4
am 53f772ed: am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
2010-04-10 11:53:52 -07:00
Grace Kloba
efb30d9681
am 449491ce: am 210462e5: am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling.
2010-04-10 11:53:46 -07:00
Wu-cheng Li
4393b01383
am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
...
Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken
* commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
2010-04-10 11:48:24 -07:00
Scott Main
02dd5476bb
am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
...
Merge commit '67d6590d242397acbb95814139301d2e6efd3631' into kraken
* commit '67d6590d242397acbb95814139301d2e6efd3631':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
2010-04-10 11:48:20 -07:00
Dianne Hackborn
4c1e815981
am 06af7620: am 17de1532: Merge "Fix issue #2581524 : Car home icon should always go to car home" into froyo
...
Merge commit '06af762033467bb578b9ed2be8af580cc11505a8' into kraken
* commit '06af762033467bb578b9ed2be8af580cc11505a8':
Fix issue #2581524 : Car home icon should always go to car home
2010-04-10 11:48:15 -07:00
Robert Greenwalt
0e456e93c8
am 52ebff3c: am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo
...
Merge commit '52ebff3c47eb3fcd43d0337a43312240f7d2010e' into kraken
* commit '52ebff3c47eb3fcd43d0337a43312240f7d2010e':
Add warning magic to be a bit more reasonable.
2010-04-10 11:48:11 -07:00
