OSDN Git Service
Bart Sears [Thu, 27 Oct 2011 22:25:47 +0000 (22:25 +0000)]
am
88fbb19a: am
777e682f: Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
* commit '
88fbb19a55d17803bbf474c80707730b8de200e4':
Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list
Bart Sears [Thu, 27 Oct 2011 22:21:34 +0000 (22:21 +0000)]
am
777e682f: Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
* commit '
777e682f13c8874f60ca21cb9264ae26a9d19a40':
Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list
Bart Sears [Thu, 27 Oct 2011 22:20:12 +0000 (15:20 -0700)]
Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
Michael Jurka [Thu, 27 Oct 2011 21:59:30 +0000 (21:59 +0000)]
am
c4f09e03: Merge "Fix recents button on large devices (
5490265)" into ics-mr1
* commit '
c4f09e03099cddc57aa5b777921182ab1d13ae8a':
Fix recents button on large devices (
5490265)
Michael Jurka [Thu, 27 Oct 2011 21:55:37 +0000 (14:55 -0700)]
Merge "Fix recents button on large devices (
5490265)" into ics-mr1
Eric Fischer [Thu, 27 Oct 2011 21:54:11 +0000 (21:54 +0000)]
am
d01b6451: (-s ours) am
60912254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
d01b6451c6caaf33b827a3eeee10b0f54dd93650':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Thu, 27 Oct 2011 21:54:09 +0000 (21:54 +0000)]
am
52201ae5: am
8d059ac5: Merge "Fix Tethering settings." into ics-mr0
* commit '
52201ae5421b1efed2568109f3fc37462fdb7c35':
Fix Tethering settings.
Svetoslav Ganov [Thu, 27 Oct 2011 21:52:51 +0000 (14:52 -0700)]
Merge "Minor documentation fixes for the APIs to expose virtual view tree."
Scott Main [Thu, 27 Oct 2011 21:47:51 +0000 (21:47 +0000)]
am
b4e50fe0: Merge "resolved conflicts for merge of
b6cf4b7f to ics-mr1" into ics-mr1
* commit '
b4e50fe03c269e0c6b60db1702993ac0649bb5a2':
docs: quick update for fragments guide to consider handsets and new figure (bigger update coming later)
Eric Fischer [Thu, 27 Oct 2011 21:46:42 +0000 (21:46 +0000)]
am
60912254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
60912254972abee324f10f57b0093732aa01adb8':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Thu, 27 Oct 2011 21:46:35 +0000 (21:46 +0000)]
am
8d059ac5: Merge "Fix Tethering settings." into ics-mr0
* commit '
8d059ac5b186547a86bb92678c7d1cb13fd8ce1c':
Fix Tethering settings.
RoboErik [Thu, 27 Oct 2011 21:45:44 +0000 (21:45 +0000)]
am
8805dc13: Merge "b/
5309787 Add new columns to hidden list of read only fields" into ics-mr1
* commit '
8805dc137ad2c254f25117a5eb1fd662a4ef63b0':
b/
5309787 Add new columns to hidden list of read only fields
Scott Main [Thu, 27 Oct 2011 21:43:50 +0000 (14:43 -0700)]
Merge "resolved conflicts for merge of
b6cf4b7f to ics-mr1" into ics-mr1
RoboErik [Thu, 27 Oct 2011 21:41:03 +0000 (14:41 -0700)]
Merge "b/
5309787 Add new columns to hidden list of read only fields" into ics-mr1
Scott Main [Thu, 27 Oct 2011 21:40:53 +0000 (14:40 -0700)]
resolved conflicts for merge of
b6cf4b7f to ics-mr1
Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320
James Dong [Thu, 27 Oct 2011 21:13:54 +0000 (21:13 +0000)]
am
17a5fb36: Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
* commit '
17a5fb36f88d90e30fd656d0d93b540ec2e2b84a':
Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.
James Dong [Thu, 27 Oct 2011 21:09:50 +0000 (14:09 -0700)]
Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
Mark Brophy [Thu, 27 Oct 2011 21:08:31 +0000 (14:08 -0700)]
Merge "Fix scroll listeners lost in ViewTreeObserver."
Gilles Debunne [Thu, 27 Oct 2011 21:04:03 +0000 (14:04 -0700)]
Merge "Potential thread concurrency issue with WordIterators."
Eric Fischer [Thu, 27 Oct 2011 20:59:51 +0000 (13:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
John Reck [Thu, 27 Oct 2011 20:43:40 +0000 (20:43 +0000)]
am
44c99092: Merge "Keep text handles in sync with native touch targets" into ics-mr1
* commit '
44c990927c362b26b51c4388f8c51e8c799f9932':
Keep text handles in sync with native touch targets
John Reck [Thu, 27 Oct 2011 20:40:24 +0000 (13:40 -0700)]
Merge "Keep text handles in sync with native touch targets" into ics-mr1
Daniel Sandler [Thu, 27 Oct 2011 20:21:15 +0000 (20:21 +0000)]
am
9760cd14: Merge "Restore bluetooth icons on tablets." into ics-mr1
* commit '
9760cd1463f06f12c1049fb7ee26796d01cbab99':
Restore bluetooth icons on tablets.
Robert Greenwalt [Thu, 27 Oct 2011 20:20:15 +0000 (13:20 -0700)]
Merge "Fix Tethering settings." into ics-mr0
RoboErik [Thu, 27 Oct 2011 20:19:06 +0000 (20:19 +0000)]
am
20345af2: Merge "Add new Calendar APIs to fw" into ics-mr1
* commit '
20345af24a50798965f6d295fbe4cc8f78c95e7f':
Add new Calendar APIs to fw
Daniel Sandler [Thu, 27 Oct 2011 20:16:43 +0000 (13:16 -0700)]
Merge "Restore bluetooth icons on tablets." into ics-mr1
RoboErik [Thu, 27 Oct 2011 20:13:36 +0000 (13:13 -0700)]
Merge "Add new Calendar APIs to fw" into ics-mr1
Scott Main [Thu, 27 Oct 2011 18:09:55 +0000 (18:09 +0000)]
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
Jeff Hamilton [Thu, 27 Oct 2011 18:08:35 +0000 (11:08 -0700)]
Merge "Clarify the docs around the activityInfo field."
Scott Main [Thu, 27 Oct 2011 18:06:15 +0000 (18:06 +0000)]
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
Scott Main [Thu, 27 Oct 2011 18:04:46 +0000 (11:04 -0700)]
Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0
satok [Thu, 27 Oct 2011 17:55:52 +0000 (17:55 +0000)]
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
satok [Thu, 27 Oct 2011 17:51:51 +0000 (17:51 +0000)]
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
satok [Thu, 27 Oct 2011 17:50:14 +0000 (10:50 -0700)]
Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0
Bill Gruber [Thu, 27 Oct 2011 17:49:25 +0000 (17:49 +0000)]
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
Bill Gruber [Thu, 27 Oct 2011 17:45:36 +0000 (17:45 +0000)]
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
Scott Main [Thu, 27 Oct 2011 17:08:51 +0000 (17:08 +0000)]
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
Scott Main [Thu, 27 Oct 2011 17:04:52 +0000 (17:04 +0000)]
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
Scott Main [Thu, 27 Oct 2011 17:03:10 +0000 (10:03 -0700)]
Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0
Eric Fischer [Thu, 27 Oct 2011 16:48:44 +0000 (16:48 +0000)]
am
80d67c66: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
80d67c66cef1b6cded786ec51d87a0c786ac12c6':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 16:43:23 +0000 (09:43 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Andreas Huber [Thu, 27 Oct 2011 16:11:56 +0000 (16:11 +0000)]
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.
Andreas Huber [Thu, 27 Oct 2011 16:07:23 +0000 (09:07 -0700)]
Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
Scott Main [Thu, 27 Oct 2011 15:55:22 +0000 (15:55 +0000)]
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
Scott Main [Thu, 27 Oct 2011 15:51:21 +0000 (15:51 +0000)]
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
Scott Main [Thu, 27 Oct 2011 15:49:48 +0000 (08:49 -0700)]
Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
Mike Lockwood [Thu, 27 Oct 2011 13:55:07 +0000 (13:55 +0000)]
am
d085df31: am
aac4184a: Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
* commit '
d085df318afc8b3485afdd81106ce93a13265ebb':
Revert "PowerManagerService: Enable light sensor debug output"
Mike Lockwood [Thu, 27 Oct 2011 13:51:04 +0000 (13:51 +0000)]
am
aac4184a: Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
* commit '
aac4184a5a0ab969140a11e1ef258fcb4cba07a9':
Revert "PowerManagerService: Enable light sensor debug output"
Mike Lockwood [Thu, 27 Oct 2011 13:49:12 +0000 (06:49 -0700)]
Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
Jason Sams [Thu, 27 Oct 2011 02:35:09 +0000 (02:35 +0000)]
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.
Jim Miller [Thu, 27 Oct 2011 02:35:02 +0000 (02:35 +0000)]
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
Jaikumar Ganesh [Thu, 27 Oct 2011 02:35:00 +0000 (02:35 +0000)]
am
c307d1ae: am
01d24784: Merge "Fix auto connection of headset profile." into ics-mr0
* commit '
c307d1aea2fe755780f02922e1d1d347bf35aba3':
Fix auto connection of headset profile.
Justin Ho [Thu, 27 Oct 2011 02:34:59 +0000 (02:34 +0000)]
am
1825e51b: am
d24b020e: Merge "Brighter sysbar assets Bug:
5509557" into ics-mr0
* commit '
1825e51b2d35e3b5a06411274ea4382da0439973':
Brighter sysbar assets Bug:
5509557
Jim Miller [Thu, 27 Oct 2011 02:34:57 +0000 (02:34 +0000)]
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
Jason Sams [Thu, 27 Oct 2011 01:25:38 +0000 (01:25 +0000)]
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.
Jim Miller [Thu, 27 Oct 2011 00:05:13 +0000 (17:05 -0700)]
Merge "Fix
5369428: Use full battery state information when determining charge status" into ics-mr1
Jaikumar Ganesh [Wed, 26 Oct 2011 23:20:48 +0000 (23:20 +0000)]
am
01d24784: Merge "Fix auto connection of headset profile." into ics-mr0
* commit '
01d24784a5ddece8bb7c5d088bf93c99faa0dc7e':
Fix auto connection of headset profile.
Jaikumar Ganesh [Wed, 26 Oct 2011 23:19:13 +0000 (16:19 -0700)]
Merge "Fix auto connection of headset profile." into ics-mr0
Justin Ho [Wed, 26 Oct 2011 23:18:32 +0000 (23:18 +0000)]
am
d24b020e: Merge "Brighter sysbar assets Bug:
5509557" into ics-mr0
* commit '
d24b020e5e6911591f3535815ef9f86b0d57f65c':
Brighter sysbar assets Bug:
5509557
Justin Ho [Wed, 26 Oct 2011 23:16:52 +0000 (16:16 -0700)]
Merge "Brighter sysbar assets Bug:
5509557" into ics-mr0
Jeff Sharkey [Wed, 26 Oct 2011 22:51:05 +0000 (22:51 +0000)]
am
fd61e702: Merge "Only populate stack when StrictMode will use it." into ics-mr1
* commit '
fd61e702e3fd7ad401abca8cab9fdada3a13b19c':
Only populate stack when StrictMode will use it.
Justin Ho [Wed, 26 Oct 2011 22:51:03 +0000 (22:51 +0000)]
am
b8c76afe: (-s ours) am
ed124603: Merge "Updated Roboto HHEA table Bug:
5516773" into ics-mr0
* commit '
b8c76afe7a2a8cd1beae96be4a623d4528b9767f':
Updated Roboto HHEA table Bug:
5516773
Jim Miller [Wed, 26 Oct 2011 22:40:08 +0000 (15:40 -0700)]
Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1
Jeff Sharkey [Wed, 26 Oct 2011 22:37:34 +0000 (15:37 -0700)]
Merge "Only populate stack when StrictMode will use it." into ics-mr1
Robert Ly [Wed, 26 Oct 2011 22:35:34 +0000 (22:35 +0000)]
Justin Ho [Wed, 26 Oct 2011 22:35:28 +0000 (22:35 +0000)]
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
Justin Ho [Wed, 26 Oct 2011 22:35:26 +0000 (22:35 +0000)]
am
9894c862: Adding alternate sound set and corresponding mk file Bug:
5502770
* commit '
9894c862db04955794471bcb13ed1068d4886536':
Adding alternate sound set and corresponding mk file Bug:
5502770
Svetoslav Ganov [Wed, 26 Oct 2011 22:35:22 +0000 (22:35 +0000)]
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.
Svetoslav Ganov [Wed, 26 Oct 2011 22:29:26 +0000 (15:29 -0700)]
resolved conflicts for merge of
b0267e28 to master
Change-Id: Ic65ab83958b2e6bb941fe015b557fd2fd8f80683
Justin Ho [Wed, 26 Oct 2011 22:24:36 +0000 (22:24 +0000)]
am
ed124603: Merge "Updated Roboto HHEA table Bug:
5516773" into ics-mr0
* commit '
ed12460301cf0e04ac61993aaf1142f75f504814':
Updated Roboto HHEA table Bug:
5516773
Justin Ho [Wed, 26 Oct 2011 22:22:57 +0000 (15:22 -0700)]
Merge "Updated Roboto HHEA table Bug:
5516773" into ics-mr0
Robert Ly [Wed, 26 Oct 2011 22:15:20 +0000 (22:15 +0000)]
Justin Ho [Wed, 26 Oct 2011 22:15:19 +0000 (22:15 +0000)]
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
Svetoslav Ganov [Wed, 26 Oct 2011 21:49:29 +0000 (14:49 -0700)]
Merge "NumberPicker does not not fit on Crespo in landscape." into ics-mr1
Svetoslav Ganov [Wed, 26 Oct 2011 21:47:49 +0000 (14:47 -0700)]
Merge "AccessibilityNodeInfo makes incorrect check before calling into the system." into ics-mr1
Justin Ho [Wed, 26 Oct 2011 21:46:15 +0000 (14:46 -0700)]
Merge "Adding alternate sound set and corresponding mk file Bug:
5502770" into ics-mr0
Justin Ho [Wed, 26 Oct 2011 21:43:00 +0000 (21:43 +0000)]
am
733442e3: am
650c052a: Merge "Notification icons increased opaqueness by 10%" into ics-mr0
* commit '
733442e33ab20c04fe115d295e2b74967e8e448d':
Notification icons increased opaqueness by 10%
Justin Ho [Wed, 26 Oct 2011 21:39:28 +0000 (21:39 +0000)]
am
650c052a: Merge "Notification icons increased opaqueness by 10%" into ics-mr0
* commit '
650c052aa38447c363163126afffb16f314bbb11':
Notification icons increased opaqueness by 10%
Justin Ho [Wed, 26 Oct 2011 21:37:43 +0000 (14:37 -0700)]
Merge "Notification icons increased opaqueness by 10%" into ics-mr0
Eric Fischer [Wed, 26 Oct 2011 21:12:34 +0000 (21:12 +0000)]
am
aa3c9b16: (-s ours) am
e2afc5bd: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
aa3c9b167421a8862fae82ba0a758ee3e27bc5e7':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 21:06:36 +0000 (21:06 +0000)]
am
e2afc5bd: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
e2afc5bd243e60bdc168ca30284607230fe646f8':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 21:04:34 +0000 (14:04 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Robert Ly [Wed, 26 Oct 2011 20:56:20 +0000 (20:56 +0000)]
am
ab1ac94e: am
576ea5eb: Merge "docs: tools/adt r15 rel notes" into ics-mr0
* commit '
ab1ac94e7336ba7a40d06573a22da23974f3923b':
docs: tools/adt r15 rel notes
Robert Ly [Wed, 26 Oct 2011 20:52:37 +0000 (20:52 +0000)]
am
576ea5eb: Merge "docs: tools/adt r15 rel notes" into ics-mr0
* commit '
576ea5eb919bc944367b7bc7aeb7d02f6d715088':
docs: tools/adt r15 rel notes
Robert Ly [Wed, 26 Oct 2011 20:50:28 +0000 (13:50 -0700)]
Merge "docs: tools/adt r15 rel notes" into ics-mr0
Jamie Gennis [Wed, 26 Oct 2011 20:39:25 +0000 (20:39 +0000)]
am
5ded5fc5: am
b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit '
5ded5fc55f2da2af0a76a9ddc52d27948b227037':
Stagefright: push blank buffers when tearing down
Jamie Gennis [Wed, 26 Oct 2011 20:34:38 +0000 (20:34 +0000)]
am
b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit '
b7b4eaaa05284634d50d581d924a250f1194f66d':
Stagefright: push blank buffers when tearing down
Jamie Gennis [Wed, 26 Oct 2011 20:33:16 +0000 (13:33 -0700)]
Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
satok [Wed, 26 Oct 2011 20:18:19 +0000 (20:18 +0000)]
am
6f444425: Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
* commit '
6f444425fe1bb62e12973c5df6a3161bc2aa2ce7':
Make FLAG_AUTO_CORRECTION public
satok [Wed, 26 Oct 2011 20:14:36 +0000 (13:14 -0700)]
Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
Mathias Agopian [Wed, 26 Oct 2011 19:51:44 +0000 (12:51 -0700)]
Merge "Rename SensorChannel to BitTube"
Eric Fischer [Wed, 26 Oct 2011 18:36:40 +0000 (18:36 +0000)]
am
08d0f642: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
08d0f6420ac439265e9b4086c931173b44409c51':
Import revised translations. DO NOT MERGE
Svetoslav Ganov [Wed, 26 Oct 2011 18:34:25 +0000 (18:34 +0000)]
am
1a3ad7d1: Merge "Adding accessibility support to the tablet swipe unlock." into ics-mr1
* commit '
1a3ad7d18f0e15611268347da7f1b5db8c3b558d':
Adding accessibility support to the tablet swipe unlock.
Eric Fischer [Wed, 26 Oct 2011 18:32:07 +0000 (11:32 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Svetoslav Ganov [Wed, 26 Oct 2011 18:30:06 +0000 (11:30 -0700)]
Merge "Adding accessibility support to the tablet swipe unlock." into ics-mr1
Philip Milne [Wed, 26 Oct 2011 17:18:30 +0000 (10:18 -0700)]
Merge " Update to fix for bug
5393156"
Irfan Sheriff [Wed, 26 Oct 2011 16:49:33 +0000 (09:49 -0700)]
Merge "Switch to notifications for walled garden"
Bart Sears [Wed, 26 Oct 2011 14:25:27 +0000 (14:25 +0000)]
am
6e03b220: am
d887377a: Merge "Fix power key handling after volume change. Bug:
5497716" into ics-mr0
* commit '
6e03b22015bd834da1a5755e75d7468e5b3b13c5':
Fix power key handling after volume change. Bug:
5497716
Dianne Hackborn [Wed, 26 Oct 2011 14:25:25 +0000 (14:25 +0000)]
am
c6592d2e: am
67a1b7d6: Merge "Fix issue #
5508024: Rotation jank seen in live wallpapers" into ics-mr0
* commit '
c6592d2eb808befedc3d9c842b61e21cc6bedbf3':
Fix issue #
5508024: Rotation jank seen in live wallpapers
Justin Ho [Wed, 26 Oct 2011 14:25:24 +0000 (14:25 +0000)]
am
7acd70f1: am
1f182af9: Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299" into ics-mr0
* commit '
7acd70f180d15e6da80d137d7cf0730e11dbd472':
Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299