git.osdn.net Git - android-x86/frameworks-native.git/log

Romain Guy [Fri, 2 Dec 2011 04:12:04 +0000 (20:12 -0800)]

am e27a07d4: Merge "Faster text clipping"

* commit 'e27a07d400db18cf99d20c2aee4d1a342e276496':
Faster text clipping

Romain Guy [Fri, 2 Dec 2011 04:09:57 +0000 (20:09 -0800)]

Merge "Faster text clipping"

Dianne Hackborn [Fri, 2 Dec 2011 02:54:30 +0000 (18:54 -0800)]

am a2a56f82: am 48e07296: am bfb3dec2: Merge "More social integration." into ics-mr1

* commit 'a2a56f82a8577625003931664240246c10552867':
More social integration.

commit | commitdiff | tree

Dianne Hackborn [Fri, 2 Dec 2011 02:52:27 +0000 (18:52 -0800)]

am 48e07296: am bfb3dec2: Merge "More social integration." into ics-mr1

* commit '48e07296800c49f8bc9b34cc57372593021f79a1':
More social integration.

commit | commitdiff | tree

Dianne Hackborn [Fri, 2 Dec 2011 02:50:36 +0000 (18:50 -0800)]

am bfb3dec2: Merge "More social integration." into ics-mr1

* commit 'bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10':
More social integration.

commit | commitdiff | tree

Dianne Hackborn [Fri, 2 Dec 2011 02:48:32 +0000 (18:48 -0800)]

Merge "More social integration." into ics-mr1

commit | commitdiff | tree

Stephen Hines [Fri, 2 Dec 2011 02:27:22 +0000 (18:27 -0800)]

am 4d86d334: am 88c02e8c: am 976ae272: Add support for handling a bitcode wrapper to librs.

* commit '4d86d334e7214ccdcd689647707aa3d0ec080841':
Add support for handling a bitcode wrapper to librs.

commit | commitdiff | tree

Stephen Hines [Fri, 2 Dec 2011 02:25:20 +0000 (18:25 -0800)]

am 88c02e8c: am 976ae272: Add support for handling a bitcode wrapper to librs.

* commit '88c02e8c5d30c053a4faa897e322540f61914718':
Add support for handling a bitcode wrapper to librs.

commit | commitdiff | tree

Stephen Hines [Fri, 2 Dec 2011 02:10:29 +0000 (18:10 -0800)]

am 976ae272: Add support for handling a bitcode wrapper to librs.

* commit '976ae27270a64c5abeb380d6e61d6d71f29b9433':
Add support for handling a bitcode wrapper to librs.

commit | commitdiff | tree

Gilles Debunne [Fri, 2 Dec 2011 00:12:31 +0000 (16:12 -0800)]

am 0715f126: am b4812f8a: am 335c4e6c: Broken build. New methods made private.

* commit '0715f12605933f1587012705d0cd0c1a34fe11da':
Broken build. New methods made private.

commit | commitdiff | tree

Gilles Debunne [Fri, 2 Dec 2011 00:10:03 +0000 (16:10 -0800)]

am b4812f8a: am 335c4e6c: Broken build. New methods made private.

* commit 'b4812f8a815a4c4a9896e73412f4011d7a30f03f':
Broken build. New methods made private.

commit | commitdiff | tree

Gilles Debunne [Fri, 2 Dec 2011 00:06:51 +0000 (16:06 -0800)]

am 335c4e6c: Broken build. New methods made private.

* commit '335c4e6cb2094c7cbd6039e0c7915702b69e7657':
Broken build. New methods made private.

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:11:31 +0000 (15:11 -0800)]

am 03cb8bc4: am 120cb5af: am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1

* commit '03cb8bc4502cf00f4e89e6780ba96cd42cc7d2c4':
Scroll performance improved in multiline TextEdit

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:11:29 +0000 (15:11 -0800)]

am 44bba9a8: am ee8862dc: am eb189d39: Merge "Performance improvement in TextView" into ics-mr1

* commit '44bba9a8bb97ffc9b9c99fa3e5fe9b4e6a2de963':
Performance improvement in TextView

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:09:07 +0000 (15:09 -0800)]

am 2101c575: am a8205d24: am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1

* commit '2101c57552ad5e184e718683a7774d82f1ce01d4':
Better handles' visibility test

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:09:00 +0000 (15:09 -0800)]

am 120cb5af: am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1

* commit '120cb5afd345a97c5e43683232c857ce2e5c8f29':
Scroll performance improved in multiline TextEdit

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:08:58 +0000 (15:08 -0800)]

am ee8862dc: am eb189d39: Merge "Performance improvement in TextView" into ics-mr1

* commit 'ee8862dc7b7266ee99633e0f13b2393a2185c30d':
Performance improvement in TextView

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:07:10 +0000 (15:07 -0800)]

am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1

* commit '58d8953958ce452c5080eaa582d7e5d2b5017398':
Scroll performance improved in multiline TextEdit

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:07:08 +0000 (15:07 -0800)]

am eb189d39: Merge "Performance improvement in TextView" into ics-mr1

* commit 'eb189d399a459c2e1ad29e1beba70d1de9f447b3':
Performance improvement in TextView

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:06:49 +0000 (15:06 -0800)]

am a8205d24: am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1

* commit 'a8205d24703fc353076cf30795b3a06a87208cfa':
Better handles' visibility test

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:04:46 +0000 (15:04 -0800)]

am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1

* commit '09cbff0294a27d33c93de50e0b4471ad86154a84':
Better handles' visibility test

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:04:35 +0000 (15:04 -0800)]

Merge "Scroll performance improved in multiline TextEdit" into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:03:55 +0000 (15:03 -0800)]

Merge "Performance improvement in TextView" into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 23:03:27 +0000 (15:03 -0800)]

Merge "Better handles' visibility test" into ics-mr1

commit | commitdiff | tree

Winson Chung [Thu, 1 Dec 2011 23:01:18 +0000 (15:01 -0800)]

am 01c35c54: am ecdc38be: am cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1

* commit '01c35c54d064039fd8d8507f8928fbec3930ee04':
Adding a sound when you take a screenshot. (Bug 5617734)

commit | commitdiff | tree

Winson Chung [Thu, 1 Dec 2011 22:59:45 +0000 (14:59 -0800)]

am ecdc38be: am cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1

* commit 'ecdc38be1ef6ee5375ff6abe92f2e1e84a78ea57':
Adding a sound when you take a screenshot. (Bug 5617734)

commit | commitdiff | tree

Winson Chung [Thu, 1 Dec 2011 22:57:50 +0000 (14:57 -0800)]

am cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1

* commit 'cea32ecd3aef013bc5da6e401eeb8e9e8cd1b595':
Adding a sound when you take a screenshot. (Bug 5617734)

commit | commitdiff | tree

Winson Chung [Thu, 1 Dec 2011 22:55:41 +0000 (14:55 -0800)]

Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1

commit | commitdiff | tree

Kenny Root [Thu, 1 Dec 2011 22:21:51 +0000 (14:21 -0800)]

am cfe82181: am 7f36d421: am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1

* commit 'cfe82181cbe84b478b4612d25fb78a6bba8b2437':
Fix free_cache to actually work

commit | commitdiff | tree

Kenny Root [Thu, 1 Dec 2011 22:18:58 +0000 (14:18 -0800)]

am 7f36d421: am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1

* commit '7f36d4217269e79f8409c46f12f10464a1f585ea':
Fix free_cache to actually work

commit | commitdiff | tree

Kenny Root [Thu, 1 Dec 2011 22:16:18 +0000 (14:16 -0800)]

am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1

* commit '5a7c91769f011bc150c9def9edab9cccb4761c66':
Fix free_cache to actually work

commit | commitdiff | tree

Kenny Root [Thu, 1 Dec 2011 22:14:22 +0000 (14:14 -0800)]

Merge "Fix free_cache to actually work" into ics-mr1

commit | commitdiff | tree

Glenn Kasten [Thu, 1 Dec 2011 21:57:14 +0000 (13:57 -0800)]

am d01d2611: Merge "Add README for media "automated" tests"

* commit 'd01d261183a4b832c2575ae0d82f68125605b21e':
Add README for media "automated" tests

commit | commitdiff | tree

Glenn Kasten [Thu, 1 Dec 2011 21:55:41 +0000 (13:55 -0800)]

Merge "Add README for media "automated" tests"

commit | commitdiff | tree

Roman Nurik [Thu, 1 Dec 2011 21:50:00 +0000 (13:50 -0800)]

am 8077b4fe: am aeda641e: am a7d825dd: am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0

* commit '8077b4feba20505e329ba907feb5e8a456d7d150':
Update widget design guidelines for padding and 8dp.

commit | commitdiff | tree

Roman Nurik [Thu, 1 Dec 2011 21:47:29 +0000 (13:47 -0800)]

am aeda641e: am a7d825dd: am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0

* commit 'aeda641e331e86f86b19493f9e5c1be38a45f5db':
Update widget design guidelines for padding and 8dp.

commit | commitdiff | tree

Roman Nurik [Thu, 1 Dec 2011 21:44:41 +0000 (13:44 -0800)]

am a7d825dd: am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0

* commit 'a7d825dddcb2e8bfd765bad2fb406498f4f1e37e':
Update widget design guidelines for padding and 8dp.

commit | commitdiff | tree

Roman Nurik [Thu, 1 Dec 2011 21:42:23 +0000 (13:42 -0800)]

am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0

* commit 'c3998ced746ee97bc5f10a9de1b2848f85c8711e':
Update widget design guidelines for padding and 8dp.

commit | commitdiff | tree

Roman Nurik [Thu, 1 Dec 2011 21:40:38 +0000 (13:40 -0800)]

Merge "Update widget design guidelines for padding and 8dp." into ics-mr0

commit | commitdiff | tree

Matthew Xie [Thu, 1 Dec 2011 21:38:37 +0000 (13:38 -0800)]

am 2f2e3ba1: am 6001d3ad: am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1

* commit '2f2e3ba11c804407a9a99a0cc73fca851a1d1d43':
Unlink the Binder DeathRecipient when removing a Bluetooth service record

commit | commitdiff | tree

Matthew Xie [Thu, 1 Dec 2011 21:36:48 +0000 (13:36 -0800)]

am 6001d3ad: am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1

* commit '6001d3ad9f5ddb5be09ec6e70b5e646cb9a0f469':
Unlink the Binder DeathRecipient when removing a Bluetooth service record

commit | commitdiff | tree

Matthew Xie [Thu, 1 Dec 2011 21:34:18 +0000 (13:34 -0800)]

am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1

* commit '1a1be44c5bf1e6099d678c81ef5e9326cabcb3df':
Unlink the Binder DeathRecipient when removing a Bluetooth service record

commit | commitdiff | tree

Matthew Xie [Thu, 1 Dec 2011 21:32:19 +0000 (13:32 -0800)]

Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1

commit | commitdiff | tree

Jeff Sharkey [Thu, 1 Dec 2011 21:30:03 +0000 (13:30 -0800)]

am 7a1c428e: Merge "Uniform rethrowing of NDC exceptions."

* commit '7a1c428ed3ded71f92733ebcb9d7ce0963dc72d2':
Uniform rethrowing of NDC exceptions.

commit | commitdiff | tree

Jeff Sharkey [Thu, 1 Dec 2011 21:27:38 +0000 (13:27 -0800)]

Merge "Uniform rethrowing of NDC exceptions."

commit | commitdiff | tree

Svetoslav Ganov [Thu, 1 Dec 2011 21:04:14 +0000 (13:04 -0800)]

am 55cdacb9: am 0bfdd7c2: am e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1

* commit '55cdacb9ba22ce0e40918fd54acca7df62637ca6':
Fix memory leaks in the accessibility layer.

commit | commitdiff | tree

Svetoslav Ganov [Thu, 1 Dec 2011 21:01:50 +0000 (13:01 -0800)]

am 0bfdd7c2: am e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1

* commit '0bfdd7c2927fb683b89fdd52befe643e8e069e77':
Fix memory leaks in the accessibility layer.

commit | commitdiff | tree

Svetoslav Ganov [Thu, 1 Dec 2011 20:59:11 +0000 (12:59 -0800)]

am e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1

* commit 'e9f24a43021734d28a4f65ebc804847b31ce13e8':
Fix memory leaks in the accessibility layer.

commit | commitdiff | tree

Svetoslav Ganov [Thu, 1 Dec 2011 20:57:12 +0000 (12:57 -0800)]

Merge "Fix memory leaks in the accessibility layer." into ics-mr1

commit | commitdiff | tree

Dianne Hackborn [Thu, 1 Dec 2011 20:54:44 +0000 (12:54 -0800)]

am 4da2f669: am c4c19a23: am 55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1

* commit '4da2f669bfdf95c0e4944f075f699ad53ee360a5':
Improve how we manage the previous app.

commit | commitdiff | tree

Dianne Hackborn [Thu, 1 Dec 2011 20:52:07 +0000 (12:52 -0800)]

am c4c19a23: am 55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1

* commit 'c4c19a23d74896b4117bf274d1d7e0268ab401c3':
Improve how we manage the previous app.

commit | commitdiff | tree

Dianne Hackborn [Thu, 1 Dec 2011 20:49:38 +0000 (12:49 -0800)]

am 55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1

* commit '55e81bd0f219acbe00bbeebc8d33ef9c67a4aa60':
Improve how we manage the previous app.

commit | commitdiff | tree

Dianne Hackborn [Thu, 1 Dec 2011 20:47:43 +0000 (12:47 -0800)]

Merge "Improve how we manage the previous app." into ics-mr1

commit | commitdiff | tree

Daniel Sandler [Thu, 1 Dec 2011 20:44:32 +0000 (12:44 -0800)]

am d884f5a1: am 0c22fa74: am b73dc9c8: Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1

* commit 'd884f5a14a1c481b33df050ee7e3671931bef07a':
Add copious navigation bar info to SystemUI dumps.

commit | commitdiff | tree

Bill Gruber [Thu, 1 Dec 2011 20:44:30 +0000 (12:44 -0800)]

am 9b188ea2: am 92a2f5fd: am 715a3c52: am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0

* commit '9b188ea2b74e749eef19fcb67feaca77e09f1cde':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 20:44:28 +0000 (12:44 -0800)]

am f434ad0f: am 42e4ecc7: am a8fa89f7: am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0

* commit 'f434ad0fe224756aa5984fe5e829b0c333bbe9e3':
docs: dashboard update for 12/1

commit | commitdiff | tree

Daniel Sandler [Thu, 1 Dec 2011 20:41:57 +0000 (12:41 -0800)]

am 0c22fa74: am b73dc9c8: Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1

* commit '0c22fa749a779fd539c4c13f83364efc611c3694':
Add copious navigation bar info to SystemUI dumps.

commit | commitdiff | tree

Bill Gruber [Thu, 1 Dec 2011 20:41:54 +0000 (12:41 -0800)]

am 92a2f5fd: am 715a3c52: am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0

* commit '92a2f5fd6a8e423d6c9ef5b42c576a2ce7e900a2':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 20:41:48 +0000 (12:41 -0800)]

am 42e4ecc7: am a8fa89f7: am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0

* commit '42e4ecc7277bb568971c701e14ac2f97da7b4d02':
docs: dashboard update for 12/1

commit | commitdiff | tree

Amith Yamasani [Thu, 1 Dec 2011 20:20:36 +0000 (12:20 -0800)]

am 41995689: am 52976f04: am e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1

* commit '41995689f26dc44be9628bb81e9448d067d66fff':
No clicking on volume icon in volume dialog.

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 20:20:33 +0000 (12:20 -0800)]

am 67592fad: am 075bd9eb: am 4f926932: am acf1038a: docs: remove broken link from renderscript docs bug: 5696178

* commit '67592fad192f6988cbeeb56052ee1d2e1ef3e38f':
docs: remove broken link from renderscript docs bug: 5696178

commit | commitdiff | tree

Amith Yamasani [Thu, 1 Dec 2011 20:17:50 +0000 (12:17 -0800)]

am 52976f04: am e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1

* commit '52976f04d8bebf44398a94cf5796f6a998c8935d':
No clicking on volume icon in volume dialog.

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 20:17:46 +0000 (12:17 -0800)]

am 075bd9eb: am 4f926932: am acf1038a: docs: remove broken link from renderscript docs bug: 5696178

* commit '075bd9eb93449fb0a5c6da1379e11f51f8379794':
docs: remove broken link from renderscript docs bug: 5696178

commit | commitdiff | tree

Daniel Sandler [Thu, 1 Dec 2011 20:11:23 +0000 (12:11 -0800)]

am b73dc9c8: Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1

* commit 'b73dc9c852f73c7d61f317b5ec7b74766d2f22d5':
Add copious navigation bar info to SystemUI dumps.

commit | commitdiff | tree

Daniel Sandler [Thu, 1 Dec 2011 20:09:51 +0000 (12:09 -0800)]

Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 20:01:21 +0000 (12:01 -0800)]

am 6bb5fc57: am 4fec974c: am 0433c157: Merge "TextViews keep focus after Done" into ics-mr1

* commit '6bb5fc577d326cfef5b7b15457ef145118e2e904':
TextViews keep focus after Done

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 20:01:19 +0000 (12:01 -0800)]

am ad79297a: am d732efa2: am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1

* commit 'ad79297a4118e73e7828f08545963e9795407df1':
Revert "IME action (done, next...) correctly handled"

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 19:59:08 +0000 (11:59 -0800)]

am 4fec974c: am 0433c157: Merge "TextViews keep focus after Done" into ics-mr1

* commit '4fec974c2f75886516509699ccfc0100b029fe4d':
TextViews keep focus after Done

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 19:59:07 +0000 (11:59 -0800)]

am d732efa2: am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1

* commit 'd732efa2972eaaa22ff921c39744ec969598bcd0':
Revert "IME action (done, next...) correctly handled"

commit | commitdiff | tree

Bill Gruber [Thu, 1 Dec 2011 19:56:55 +0000 (11:56 -0800)]

am 715a3c52: am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0

* commit '715a3c52ccd896265b4e57835d196bf7a2a17437':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 19:56:54 +0000 (11:56 -0800)]

am a8fa89f7: am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0

* commit 'a8fa89f7f4e658c41dba466b10459208d673bc3a':
docs: dashboard update for 12/1

commit | commitdiff | tree

Bill Gruber [Thu, 1 Dec 2011 19:54:57 +0000 (11:54 -0800)]

am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0

* commit '92ad16d342aa4d39bad33600161b3799b84716f3':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 19:54:55 +0000 (11:54 -0800)]

am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0

* commit '8f3993b12b52ac5d94d84376ec4f42b130018429':
docs: dashboard update for 12/1

commit | commitdiff | tree

Bill Gruber [Thu, 1 Dec 2011 19:53:23 +0000 (11:53 -0800)]

Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 19:53:17 +0000 (11:53 -0800)]

Merge "docs: dashboard update for 12/1" into ics-mr0

commit | commitdiff | tree

Amith Yamasani [Thu, 1 Dec 2011 19:37:32 +0000 (11:37 -0800)]

am e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1

* commit 'e9b0608c76bd19356f3141358ffdf134b7a9700f':
No clicking on volume icon in volume dialog.

commit | commitdiff | tree

Amith Yamasani [Thu, 1 Dec 2011 19:35:30 +0000 (11:35 -0800)]

Merge "No clicking on volume icon in volume dialog." into ics-mr1

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 19:23:15 +0000 (11:23 -0800)]

am 4f926932: am acf1038a: docs: remove broken link from renderscript docs bug: 5696178

* commit '4f9269323b2d8d945d33f9bd79d8b8c3ab6bc3b0':
docs: remove broken link from renderscript docs bug: 5696178

commit | commitdiff | tree

Scott Main [Thu, 1 Dec 2011 19:20:03 +0000 (11:20 -0800)]

am acf1038a: docs: remove broken link from renderscript docs bug: 5696178

* commit 'acf1038a260d7b2a3bb6b36058da47041c8ec173':
docs: remove broken link from renderscript docs bug: 5696178

commit | commitdiff | tree

Chet Haase [Thu, 1 Dec 2011 18:37:53 +0000 (10:37 -0800)]

am de5b3a09: Merge "Protect code in ViewPropertyAnimator from potential null deref"

* commit 'de5b3a0933e17218f75ec42a244f482f7ead2d37':
Protect code in ViewPropertyAnimator from potential null deref

commit | commitdiff | tree

Chet Haase [Thu, 1 Dec 2011 18:35:18 +0000 (10:35 -0800)]

Merge "Protect code in ViewPropertyAnimator from potential null deref"

commit | commitdiff | tree

Andreas Huber [Thu, 1 Dec 2011 18:25:52 +0000 (10:25 -0800)]

am f8ebb32d: am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit 'f8ebb32d1fa8fc521f47d83ffa77e20ded066c45':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 18:24:23 +0000 (10:24 -0800)]

am 0433c157: Merge "TextViews keep focus after Done" into ics-mr1

* commit '0433c157141b9122f6c61498e909770f1db27c7c':
TextViews keep focus after Done

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 18:24:21 +0000 (10:24 -0800)]

am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1

* commit 'b2aa672f24ea0d746f3b96c24e376d5e2c041dc3':
Revert "IME action (done, next...) correctly handled"

commit | commitdiff | tree

Andreas Huber [Thu, 1 Dec 2011 18:22:19 +0000 (10:22 -0800)]

am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit '10526a0bfe070ac4d1e550a81ed68be35d261b16':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 18:22:15 +0000 (10:22 -0800)]

Merge "TextViews keep focus after Done" into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Thu, 1 Dec 2011 18:21:59 +0000 (10:21 -0800)]

Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1

commit | commitdiff | tree

Andreas Huber [Thu, 1 Dec 2011 18:20:09 +0000 (10:20 -0800)]

am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions

commit | commitdiff | tree

Andreas Huber [Thu, 1 Dec 2011 18:18:19 +0000 (10:18 -0800)]

Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

commit | commitdiff | tree

Robert Greenwalt [Thu, 1 Dec 2011 17:48:11 +0000 (09:48 -0800)]

am 89b26299: am c8e643a8: am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1

* commit '89b262990fc82b1b928519744b1640ead406f110':
Fix state synchronization problem.

commit | commitdiff | tree

Robert Greenwalt [Thu, 1 Dec 2011 17:46:14 +0000 (09:46 -0800)]

am c8e643a8: am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1

* commit 'c8e643a86345ef7e2807946107062c9d8635455d':
Fix state synchronization problem.

commit | commitdiff | tree

Robert Greenwalt [Thu, 1 Dec 2011 17:44:12 +0000 (09:44 -0800)]

am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1

* commit '22d5d7b6e865e36eb3e057bc27d339d56c292d20':
Fix state synchronization problem.

commit | commitdiff | tree

Robert Greenwalt [Thu, 1 Dec 2011 17:42:13 +0000 (09:42 -0800)]

Merge "Fix state synchronization problem." into ics-mr1

commit | commitdiff | tree

Ben Murdoch [Thu, 1 Dec 2011 17:10:06 +0000 (09:10 -0800)]

am 9c8fc9c6: am fc00b6aa: am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1

* commit '9c8fc9c62015382a9369f983a7ac6c655d9bbaaf':
Fix crash with HTML5 video.

commit | commitdiff | tree

Ben Murdoch [Thu, 1 Dec 2011 17:08:00 +0000 (09:08 -0800)]

am fc00b6aa: am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1

* commit 'fc00b6aac4a5f9222d36b7db5209bca9b63b55d6':
Fix crash with HTML5 video.

commit | commitdiff | tree

Ben Murdoch [Thu, 1 Dec 2011 17:05:55 +0000 (09:05 -0800)]

am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1

* commit '90ea4c4d30ccafb51e024ab3c34a4655d06eec4c':
Fix crash with HTML5 video.

commit | commitdiff | tree

Ben Murdoch [Thu, 1 Dec 2011 17:03:22 +0000 (09:03 -0800)]

Merge "Fix crash with HTML5 video." into ics-mr1

commit | commitdiff | tree

Daniel Sandler [Thu, 1 Dec 2011 14:35:34 +0000 (06:35 -0800)]

am d2a28b3e: am 859bc015: (-s ours) am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1

* commit 'd2a28b3ee07e27cc374d07b02995fb865474aae7':
Put screensavers back in the icebox for now. DO NOT MERGE.

commit | commitdiff | tree

Daniel Sandler [Thu, 1 Dec 2011 14:33:07 +0000 (06:33 -0800)]

am 859bc015: (-s ours) am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1

* commit '859bc0153e37a7eb65216c0a5f7ea46f5559b453':
Put screensavers back in the icebox for now. DO NOT MERGE.

commit | commitdiff | tree

Daniel Sandler [Thu, 1 Dec 2011 14:31:09 +0000 (06:31 -0800)]

am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1

* commit '2a40d0d92b208021b492e9af3d944720cbf269fc':
Put screensavers back in the icebox for now. DO NOT MERGE.