Scott Main
3b986c3b8e
am 7c210d2d: am cbce4eda: Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0
...
* commit '7c210d2dad36f19abefe4e1e8224579c66a737c4':
docs: change calendar overview to recommend using data URI instead of MIME type for event intents
2011-10-27 18:09:55 +00:00
Jeff Hamilton
a880d3ebb5
Merge "Clarify the docs around the activityInfo field."
2011-10-27 11:08:35 -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
0ab3d2e85b
am c04e2d5f: am e0122406: Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0
...
* commit 'c04e2d5f1678b3251edbcc1297015b49b36086a7':
Add a path to HelloSpellChecker sample application for SDK build
2011-10-27 17:55:52 +00: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
374fa8098e
am a9039329: am 6c60e9a3: docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672
...
* commit 'a903932948c0a93b47e243a1dcd6e2a8643191ff':
docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672
2011-10-27 17:49:25 +00: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
d9b063ae30
am 3c81fc9e: am 56539858: Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0
...
* commit '3c81fc9e50cd1475e58e0b979d5ee26da00afd01':
docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc
2011-10-27 17:08:51 +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
f9519fc7c7
am 80d67c66: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '80d67c66cef1b6cded786ec51d87a0c786ac12c6':
Import revised translations. DO NOT MERGE
2011-10-27 16:48:44 +00:00
Eric Fischer
cff4669356
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-10-27 09:43:23 -07:00
Andreas Huber
38b2f70d78
am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
...
* commit '1388aced2a5ce3aafa8b0ae922925efafb61a5e1':
Fix a reference to a stale pointer in AwesomePlayer.
2011-10-27 16:11:56 +00: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
366ccb533e
am 12f9900b: am 737c3dd9: Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
...
* commit '12f9900bfb004a09ea6a8ce0df27c661124f46ac':
docs: add package description for wifi.p2p and update the one for wifi
2011-10-27 15:55:22 +00: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
df86d3033e
am d085df31: am aac4184a: Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
...
* commit 'd085df318afc8b3485afdd81106ce93a13265ebb':
Revert "PowerManagerService: Enable light sensor debug output"
2011-10-27 13:55:07 +00: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
Jason Sams
9ae1f641ee
am 27812a8f: 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 '27812a8f14ca22f0a709320e5a41d200ac59b63b':
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 02:35:09 +00:00
Jim Miller
5e17573ab6
am 11bfc0c4: Merge "Fix 5369428: Use full battery state information when determining charge status" into ics-mr1
...
* commit '11bfc0c431f57e7aac6190aa77b311c649a01619':
Fix 5369428: Use full battery state information when determining charge status
2011-10-27 02:35:02 +00:00
Jaikumar Ganesh
5e8c34860a
am c307d1ae: am 01d24784: Merge "Fix auto connection of headset profile." into ics-mr0
...
* commit 'c307d1aea2fe755780f02922e1d1d347bf35aba3':
Fix auto connection of headset profile.
2011-10-27 02:35:00 +00:00
Justin Ho
067f516083
am 1825e51b: am d24b020e: Merge "Brighter sysbar assets Bug: 5509557" into ics-mr0
...
* commit '1825e51b2d35e3b5a06411274ea4382da0439973':
Brighter sysbar assets Bug: 5509557
2011-10-27 02:34:59 +00:00
Jim Miller
d68bb8a6a6
am 2333a02e: (-s ours) Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1
...
* commit '2333a02e152616c4b982c149ea2a5c9e9615e274':
Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE
2011-10-27 02:34:57 +00: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
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
Jeff Sharkey
7c93429cc4
am fd61e702: Merge "Only populate stack when StrictMode will use it." into ics-mr1
...
* commit 'fd61e702e3fd7ad401abca8cab9fdada3a13b19c':
Only populate stack when StrictMode will use it.
2011-10-26 22:51:05 +00:00
Justin Ho
43902a6fa5
am b8c76afe: (-s ours) am ed124603: Merge "Updated Roboto HHEA table Bug: 5516773" into ics-mr0
...
* commit 'b8c76afe7a2a8cd1beae96be4a623d4528b9767f':
Updated Roboto HHEA table Bug: 5516773
2011-10-26 22:51:03 +00: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
Robert Ly
c50666366e
am 4d48303f: am 37f4310d: fix build
...
* commit '4d48303fd84cdcbe1763e621c5b6a6ad08e72c7c':
fix build
2011-10-26 22:35:34 +00:00
Justin Ho
087ea1b227
am 44e10f0a: am 7901a2c3: Merge "Adding alternate sound set and corresponding mk file Bug: 5502770" into ics-mr0
...
* commit '44e10f0add63ee2c75a0039aac105ecba5b2360c':
Adding alternate sound set and corresponding mk file Bug: 5502770
2011-10-26 22:35:28 +00:00
Justin Ho
dc1d885844
am 9894c862: Adding alternate sound set and corresponding mk file Bug: 5502770
...
* commit '9894c862db04955794471bcb13ed1068d4886536':
Adding alternate sound set and corresponding mk file Bug: 5502770
2011-10-26 22:35:26 +00:00
Svetoslav Ganov
e38ac4fe6d
am 8c807076: Merge "NumberPicker does not not fit on Crespo in landscape." into ics-mr1
...
* commit '8c8070763971b72aa012e23585fe844b4b956282':
NumberPicker does not not fit on Crespo in landscape.
2011-10-26 22:35:22 +00:00
Svetoslav Ganov
c5782b969d
resolved conflicts for merge of b0267e28 to master
...
Change-Id: Ic65ab83958b2e6bb941fe015b557fd2fd8f80683
2011-10-26 15:29:26 -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
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
42f4f26fe6
am 733442e3: am 650c052a: Merge "Notification icons increased opaqueness by 10%" into ics-mr0
...
* commit '733442e33ab20c04fe115d295e2b74967e8e448d':
Notification icons increased opaqueness by 10%
2011-10-26 21:43:00 +00:00