Tsu Chiang Chuang
a8bc0dd7f4
Merge "Force an update before we poll for the data."
2011-09-16 17:48:35 -07:00
Tsu Chiang Chuang
70f1ad2d15
Merge "add upload capabilities to data test."
2011-09-16 17:48:17 -07:00
Mathias Agopian
f297a35ff4
am 1afeea0f: (-s ours) Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
...
* commit '1afeea0f207f8b8b781f799f5d150b70495abb1a':
work around a problem where fp registers get corrupted (DO NOT MERGE)
2011-09-16 17:09:33 -07:00
Mathias Agopian
0d8088e8f1
Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
2011-09-16 17:08:21 -07:00
Fabrice Di Meglio
30aacb9d96
Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"
2011-09-16 17:07:08 -07:00
Romain Guy
5e5a43e485
Merge "Forces AsyncTask to use the main looper Bug #5333924 "
2011-09-16 16:50:22 -07:00
Romain Guy
e64761b3e9
Merge "Clarify documentation of AdapterView.OnItemSelectedListener Bug #5331587 "
2011-09-16 16:20:17 -07:00
Eric Fischer
8b92fec903
am a2a960b4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit 'a2a960b4a14f473f7677694973b5b9274eccc516':
Import revised translations. DO NOT MERGE
2011-09-16 16:19:19 -07:00
Eric Fischer
8d7c5ea0fd
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-16 16:17:45 -07:00
Jeff Sharkey
817d975f37
Merge "Fix "am profile" when run on system_server."
2011-09-16 15:11:06 -07:00
Jean-Michel Trivi
09175670a7
am f79ec360: Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
...
* commit 'f79ec360984011c49c52b7a19b96cbbc932df4be':
Fix bug 5327199 Recycle bitmaps in RemoteControlClient
2011-09-16 15:02:43 -07:00
Jean-Michel Trivi
7990b9d409
Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
2011-09-16 15:01:06 -07:00
Justin Ho
fafa5f0042
am 218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
...
* commit '218148f1ffb574282bdc72a1a4cc97b7129cf043':
Revert "Adding selected state for scrubber control"
2011-09-16 14:49:17 -07:00
Justin Ho
0390fd7eb3
Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
2011-09-16 14:47:54 -07:00
John Reck
49e81d4426
Merge "Don't switch to handle drag mode when starting selection"
2011-09-16 14:24:33 -07:00
Justin Ho
9786b94840
am 5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom
...
* commit '5855c0ca68de7103e59e4a6e6996fba528cabd9a':
Adding selected state for scrubber control
2011-09-16 14:16:53 -07:00
Justin Ho
a6a42ff456
Merge "Adding selected state for scrubber control" into ics-factoryrom
2011-09-16 14:15:04 -07:00
Nick Kralevich
77a8b08682
Merge "AudioResampler: use relative instead of absolute labels"
2011-09-16 13:56:16 -07:00
Jeff Brown
0dd2f48612
am a82f4483: (-s ours) Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
...
* commit 'a82f448373ca0f0e67fb52a2bdc489c4ed0b17ac':
Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776
2011-09-16 13:44:40 -07:00
Adam Powell
8096736926
Merge "Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls."
2011-09-16 13:44:35 -07:00
Dianne Hackborn
b72c291402
Merge ""Fix" issue #5276520 : Noise on edges of rotation animation"
2011-09-16 13:43:01 -07:00
Jeff Brown
d20d20b5da
Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
2011-09-16 13:42:46 -07:00
John Reck
eb2afca1a7
am 41d6bfb2: (-s ours) Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
...
* commit '41d6bfb27909c2f27e41b5aa1d182e00b4c2f631':
DO NOT MERGE Fix text selection drawing on SW
2011-09-16 13:23:37 -07:00
John Reck
35e59f0617
Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
2011-09-16 13:21:31 -07:00
Jeff Brown
4df42561ed
Merge "Make LTE_FLOAT a strict weak order. Bug: 5327776"
2011-09-16 13:11:24 -07:00
Mathias Agopian
b74b87c516
Merge "cleanup: fix typos in logs"
2011-09-16 12:58:30 -07:00
Fred Quintana
02a7421857
am 3d5759b5: Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
...
* commit '3d5759b527fd0e48cfcc759dfed68fbe5a4dd050':
Add a generic account chooser/add account flow for apps.
2011-09-16 12:14:31 -07:00
Fred Quintana
975b1328f3
Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
2011-09-16 12:13:30 -07:00
Mathias Agopian
06649fece4
cleanup: fix typos in logs
...
Change-Id: Ib5744564a873ea2b84100174673dc4d3ae109fcf
2011-09-16 11:56:40 -07:00
Andreas Huber
9dbb77d04b
Fix androidGetThreadPriority for non-pthread configurations.
...
related-to-build
Change-Id: Ic865af0865906f96fd615a56a030c8e3adaf13c4
2011-09-16 11:47:13 -07:00
Eino-Ville Talvala
50c258b945
am ebdcae73: Merge "Add third video to default system videos." into ics-factoryrom
...
* commit 'ebdcae732f648871dd0df6586a5ba57aae015bd4':
Add third video to default system videos.
2011-09-16 10:53:21 -07:00
Eino-Ville Talvala
f6c0011ad2
Merge "Add third video to default system videos." into ics-factoryrom
2011-09-16 10:52:15 -07:00
Andreas Huber
fcd353149a
Merge "Various improvements to nuplayer playback"
2011-09-16 10:50:51 -07:00
Andreas Huber
0b1f5d51ae
Merge "A new API "androidGetThreadPriority""
2011-09-16 10:50:43 -07:00
John Reck
a956d43509
Merge "Fix text selection drawing on SW"
2011-09-16 10:39:16 -07:00
Andreas Huber
1d60b9629c
A new API "androidGetThreadPriority"
...
Change-Id: I6baeead8c70460863343fd557250635fb1e6a170
2011-09-16 09:33:22 -07:00
Kenny Root
8239e2322e
am 1f9a9288: Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom
...
* commit '1f9a928864be7cfc76c99b8f69706e739e6a7b08':
Be more forgiving in parsing verifier IDs
2011-09-16 09:09:30 -07:00
Kenny Root
c4fd8ada67
Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom
2011-09-16 09:07:52 -07:00
Justin Ho
0aacdd8535
am 6a7ea58e: Merge "Updated Clock and Roboto fonts Bug: 5243711" into ics-factoryrom
...
* commit '6a7ea58e826587aad89791affa29fe51d5c2e58b':
Updated Clock and Roboto fonts Bug: 5243711
2011-09-16 07:35:43 -07:00
Justin Ho
a2688e4c7c
Merge "Updated Clock and Roboto fonts Bug: 5243711" into ics-factoryrom
2011-09-16 07:32:52 -07:00
Brian Colonna
b9c977a712
Merge "Properly laying out FaceLock on lockscreen"
2011-09-16 06:08:22 -07:00
Mark Brophy
22c371d437
Merge "Fix typo in SearchManager javadoc."
2011-09-16 05:47:49 -07:00
Svetoslav Ganov
e624896e7a
am 4e3bee76: Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
...
* commit '4e3bee760a7f00e6ef3c89b937558df1ee6fcda0':
MiltiWaveView accessibility improvement.
2011-09-15 18:54:15 -07:00
Svetoslav Ganov
dd434337ab
Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
2011-09-15 18:52:40 -07:00
Svetoslav Ganov
76a8f2f73e
am 2a6798ad: Merge "Touch explorer does not perform tap with the right pointer." into ics-factoryrom
...
* commit '2a6798ada499dc1dc33db36a15a6ce07e72968ae':
Touch explorer does not perform tap with the right pointer.
2011-09-15 18:50:38 -07:00
Svetoslav Ganov
fcb3f65263
Merge "Touch explorer does not perform tap with the right pointer." into ics-factoryrom
2011-09-15 18:47:49 -07:00
Ying Wang
b6feddd978
am 070e7ee2: Merge "Use the correct dependency" into ics-factoryrom
...
* commit '070e7ee285792a2cc59e7ed1db17832e8c829275':
Use the correct dependency
2011-09-15 17:38:46 -07:00
Gloria Wang
e17ccf5ec3
am 91849473: (-s ours) Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge." into ics-factoryrom
...
* commit '918494732741c1fdceda6d2e4ea8930b559f26a4':
If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge.
2011-09-15 17:38:39 -07:00
Gloria Wang
5e74fb2649
am 62c24d7b: (-s ours) Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer\'s _release. Related to bug 5252296." into ics-factoryrom
...
* commit '62c24d7bfa5a88655ba9981dba2a565c1136a255':
Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296.
2011-09-15 17:38:36 -07:00
Ying Wang
5668777ffc
Merge "Use the correct dependency" into ics-factoryrom
2011-09-15 17:19:37 -07:00