Scott Main
a8399c8a13
resolved conflicts for merge of b6cf4b7f to ics-mr1
...
Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320
2011-10-27 14:40:53 -07:00
James Dong
8d31d261bf
Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
2011-10-27 14:09:50 -07:00
Eric Fischer
26ba3343eb
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-27 13:59:51 -07:00
John Reck
ab786ff865
Merge "Keep text handles in sync with native touch targets" into ics-mr1
2011-10-27 13:40:24 -07:00
Robert Greenwalt
31fdc2ff5d
Merge "Fix Tethering settings." into ics-mr0
2011-10-27 13:20:15 -07:00
Daniel Sandler
cbddff067d
Merge "Restore bluetooth icons on tablets." into ics-mr1
2011-10-27 13:16:43 -07:00
RoboErik
0890686ba4
Merge "Add new Calendar APIs to fw" into ics-mr1
2011-10-27 13:13:36 -07:00
Scott Main
265eb5eb36
am cbce4eda: Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0
...
* commit 'cbce4eda4fae6b18efde9aa161a665e92a36c969':
docs: change calendar overview to recommend using data URI instead of MIME type for event intents
2011-10-27 18:06:15 +00:00
Scott Main
ef6143b8df
Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0
2011-10-27 11:04:46 -07:00
satok
9d2b06600a
am e0122406: Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0
...
* commit 'e0122406bb1c512ee57f3a5a1503435a0779e1d8':
Add a path to HelloSpellChecker sample application for SDK build
2011-10-27 17:51:51 +00:00
satok
d843a4d1be
Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0
2011-10-27 10:50:14 -07:00
Bill Gruber
f6fc6d0a81
am 6c60e9a3: docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672
...
* commit '6c60e9a3ba3555590d7e7bdaf3634c9daaf8b33b':
docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672
2011-10-27 17:45:36 +00:00
Scott Main
2633aee413
am 56539858: Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0
...
* commit '5653985830f35184ea772b2ccc8333d6ef634761':
docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc
2011-10-27 17:04:52 +00:00
Scott Main
89f5fd76ca
Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0
2011-10-27 10:03:10 -07:00
Eric Fischer
cff4669356
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-10-27 09:43:23 -07:00
Andreas Huber
078f1efb36
Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
2011-10-27 09:07:23 -07:00
Scott Main
fd086579a3
am 737c3dd9: Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
...
* commit '737c3dd9f116ae68bcb9b5ce6855afaf2f59738b':
docs: add package description for wifi.p2p and update the one for wifi
2011-10-27 15:51:21 +00:00
Scott Main
5b8afb574f
Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
2011-10-27 08:49:48 -07:00
Mike Lockwood
0553be0ae2
am aac4184a: Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
...
* commit 'aac4184a5a0ab969140a11e1ef258fcb4cba07a9':
Revert "PowerManagerService: Enable light sensor debug output"
2011-10-27 13:51:04 +00:00
Mike Lockwood
3cadafc7a0
Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
2011-10-27 06:49:12 -07:00
The Android Automerger
1a0368e4cb
merge in ics-mr0-release history after reset to ics-mr0
2011-10-27 06:28:33 -07:00
Jason Sams
38dac2ebda
am 28e4f87f: Fix bug where CPU could be stuck spinning Required the wallpaper be animating and the system to have run slowly during the last frame when rendering stopped.
...
* commit '28e4f87f38cae799b494e160467d732e988bad89':
Fix bug where CPU could be stuck spinning Required the wallpaper be animating and the system to have run slowly during the last frame when rendering stopped.
2011-10-27 01:25:38 +00:00
Jim Miller
386c301b10
Merge "Fix 5369428: Use full battery state information when determining charge status" into ics-mr1
2011-10-26 17:05:13 -07:00
The Android Automerger
75fca578d0
merge in ics-mr0-release history after reset to ics-mr0
2011-10-26 16:27:20 -07:00
Jaikumar Ganesh
55eef82ef7
am 01d24784: Merge "Fix auto connection of headset profile." into ics-mr0
...
* commit '01d24784a5ddece8bb7c5d088bf93c99faa0dc7e':
Fix auto connection of headset profile.
2011-10-26 23:20:48 +00:00
Jaikumar Ganesh
809be2aa09
Merge "Fix auto connection of headset profile." into ics-mr0
2011-10-26 16:19:13 -07:00
Justin Ho
d42bd981c8
am d24b020e: Merge "Brighter sysbar assets Bug: 5509557" into ics-mr0
...
* commit 'd24b020e5e6911591f3535815ef9f86b0d57f65c':
Brighter sysbar assets Bug: 5509557
2011-10-26 23:18:32 +00:00
Justin Ho
39e9a6bb4e
Merge "Brighter sysbar assets Bug: 5509557" into ics-mr0
2011-10-26 16:16:52 -07:00
Jim Miller
9ebc59ce34
Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1
2011-10-26 15:40:08 -07:00
Jeff Sharkey
a6137a5b11
Merge "Only populate stack when StrictMode will use it." into ics-mr1
2011-10-26 15:37:34 -07:00
Justin Ho
eea0fda92e
am ed124603: Merge "Updated Roboto HHEA table Bug: 5516773" into ics-mr0
...
* commit 'ed12460301cf0e04ac61993aaf1142f75f504814':
Updated Roboto HHEA table Bug: 5516773
2011-10-26 22:24:36 +00:00
Justin Ho
42c652b056
Merge "Updated Roboto HHEA table Bug: 5516773" into ics-mr0
2011-10-26 15:22:57 -07:00
Robert Ly
945a9bd920
am 37f4310d: fix build
...
* commit '37f4310d4af51fe6e2e35d27b9375a31fc98c803':
fix build
2011-10-26 22:15:20 +00:00
Justin Ho
436e15eac9
am 7901a2c3: Merge "Adding alternate sound set and corresponding mk file Bug: 5502770" into ics-mr0
...
* commit '7901a2c3a1bfefdefd957d3d9b28dee1ca88787d':
Adding alternate sound set and corresponding mk file Bug: 5502770
2011-10-26 22:15:19 +00:00
Mathias Agopian
62f7114719
fix Corrupted graphics while playing You Tube on orientation change
...
Bug: 5432124
Change-Id: If948b9797b1ec6fff80ca5ea94508abcaced9f31
2011-10-26 15:11:59 -07:00
Svetoslav Ganov
c9a582dd04
Merge "NumberPicker does not not fit on Crespo in landscape." into ics-mr1
2011-10-26 14:49:29 -07:00
Svetoslav Ganov
7b4374c416
Merge "AccessibilityNodeInfo makes incorrect check before calling into the system." into ics-mr1
2011-10-26 14:47:49 -07:00
Justin Ho
19a93e688c
Merge "Adding alternate sound set and corresponding mk file Bug: 5502770" into ics-mr0
2011-10-26 14:46:15 -07:00
Justin Ho
753759feba
am 650c052a: Merge "Notification icons increased opaqueness by 10%" into ics-mr0
...
* commit '650c052aa38447c363163126afffb16f314bbb11':
Notification icons increased opaqueness by 10%
2011-10-26 21:39:28 +00:00
Justin Ho
5e496f4782
Merge "Notification icons increased opaqueness by 10%" into ics-mr0
2011-10-26 14:37:43 -07:00
Eric Fischer
41dead8281
am e2afc5bd: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit 'e2afc5bd243e60bdc168ca30284607230fe646f8':
Import revised translations. DO NOT MERGE
2011-10-26 21:06:36 +00:00
Eric Fischer
7bc5a18eb8
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-26 14:04:35 -07:00
Robert Ly
0d693130a6
am 576ea5eb: Merge "docs: tools/adt r15 rel notes" into ics-mr0
...
* commit '576ea5eb919bc944367b7bc7aeb7d02f6d715088':
docs: tools/adt r15 rel notes
2011-10-26 20:52:37 +00:00
Robert Ly
603a87ced4
Merge "docs: tools/adt r15 rel notes" into ics-mr0
2011-10-26 13:50:28 -07:00
Jamie Gennis
cd43e6da12
am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
...
* commit 'b7b4eaaa05284634d50d581d924a250f1194f66d':
Stagefright: push blank buffers when tearing down
2011-10-26 20:34:38 +00:00
Jamie Gennis
c3762f76a9
Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
2011-10-26 13:33:16 -07:00
satok
6965ec5295
Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
2011-10-26 13:14:36 -07:00
Eric Fischer
621ac4218d
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-10-26 11:32:07 -07:00
Svetoslav Ganov
afcb08cd0a
Merge "Adding accessibility support to the tablet swipe unlock." into ics-mr1
2011-10-26 11:30:06 -07:00
The Android Automerger
7e0785d27c
merge in ics-mr0-release history after reset to ics-mr0
2011-10-26 06:28:50 -07:00