OSDN Git Service
Dirk Dougherty [Wed, 9 Feb 2011 22:20:06 +0000 (14:20 -0800)]
am
fefa95a9: Doc change: Add version notes for Android 2.3.3.
* commit '
fefa95a9c828d2b67227894b7ee3979504c0f52a':
Doc change: Add version notes for Android 2.3.3.
Mathias Agopian [Wed, 9 Feb 2011 21:22:46 +0000 (13:22 -0800)]
am
cc24170d: Merge "fix [
3374821] Cannot take screenshot of HC preview" into honeycomb
* commit '
cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
fix [
3374821] Cannot take screenshot of HC preview
Mathias Agopian [Wed, 9 Feb 2011 21:18:53 +0000 (13:18 -0800)]
Merge "fix [
3374821] Cannot take screenshot of HC preview" into honeycomb
Dirk Dougherty [Wed, 9 Feb 2011 20:19:54 +0000 (12:19 -0800)]
am
be04bfd0: am
01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit '
be04bfd09914bbabf715959170c32030072b65f4':
Doc change: Add diff report for api 10.
Gilles Debunne [Wed, 9 Feb 2011 20:19:46 +0000 (12:19 -0800)]
am
63bd55c7: am
cdfe8999: Fix for multiple merge problem.
* commit '
63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
Fix for multiple merge problem.
Eric Fischer [Wed, 9 Feb 2011 18:47:47 +0000 (10:47 -0800)]
am
ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 18:11:18 +0000 (10:11 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Gilles Debunne [Wed, 9 Feb 2011 04:38:59 +0000 (20:38 -0800)]
Merge "resolved conflicts for merge of
e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Gilles Debunne [Wed, 9 Feb 2011 04:23:27 +0000 (20:23 -0800)]
resolved conflicts for merge of
e04c1496 to honeycomb-plus-aosp
Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e
Scott Main [Wed, 9 Feb 2011 02:48:53 +0000 (18:48 -0800)]
am
3f41d8f5: docs: fix a couple titles
* commit '
3f41d8f5ee1a8d5366d79ee03d97fac8403c676a':
docs: fix a couple titles
Scott Main [Wed, 9 Feb 2011 02:39:24 +0000 (18:39 -0800)]
am
f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
* commit '
f002b6752562a442c934bdf7c04cb0fedc24d442':
docs: shorten and revise some titles in the Developing docs and resolve respective links
Scott Main [Wed, 9 Feb 2011 02:36:04 +0000 (18:36 -0800)]
Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
Dirk Dougherty [Wed, 9 Feb 2011 01:31:54 +0000 (17:31 -0800)]
am
01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit '
01967c0ee104e985167374e41f2c416c1100f767':
Doc change: Add diff report for api 10.
Gilles Debunne [Wed, 9 Feb 2011 01:31:33 +0000 (17:31 -0800)]
am
cdfe8999: Fix for multiple merge problem.
* commit '
cdfe899991c365d9e197d83f8859089cae082011':
Fix for multiple merge problem.
Joe Malin [Wed, 9 Feb 2011 00:58:22 +0000 (16:58 -0800)]
am
7777fb04: Merge "DOC CHANGE: Fix bug
3416872 in MonkeyRunner doc" into honeycomb
* commit '
7777fb04f1bdb11628ef8978c42b14e51ebb9c56':
DOC CHANGE: Fix bug
3416872 in MonkeyRunner doc
Joe Malin [Wed, 9 Feb 2011 00:55:53 +0000 (16:55 -0800)]
Merge "DOC CHANGE: Fix bug
3416872 in MonkeyRunner doc" into honeycomb
Gilles Debunne [Wed, 9 Feb 2011 00:33:58 +0000 (16:33 -0800)]
resolved conflicts for merge of
c0728cc0 to gingerbread-plus-aosp
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
Scott Main [Tue, 8 Feb 2011 22:57:50 +0000 (14:57 -0800)]
am
b70afd34: docs: remove and correct parent links for fundamental docs and hide the "beginner\'s path" because it\'s not complete
* commit '
b70afd342b658d23518e0fa69aff9e45ec01e222':
docs: remove and correct parent links for fundamental docs and hide the "beginner's path" because it's not complete
Scott Main [Tue, 8 Feb 2011 22:57:45 +0000 (14:57 -0800)]
am
b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
* commit '
b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
docs: fix links to revised fundamentals documents
Jason Sams [Tue, 8 Feb 2011 22:57:35 +0000 (14:57 -0800)]
am
4fd70373: Merge "Fix bug
3421901 remove 2 functions from public headers in the SDK." into honeycomb
* commit '
4fd70373ecafbf5a87a1c35852aec2818612e928':
Fix bug
3421901 remove 2 functions from public headers in the SDK.
Dirk Dougherty [Tue, 8 Feb 2011 22:57:25 +0000 (14:57 -0800)]
am
50b7d70f: Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb
* commit '
50b7d70fb425daf6b2ead747df6634040d1bbf1b':
Cherrypick from gb: Doc change: Add diff report for api 10.
Xavier Ducrohet [Tue, 8 Feb 2011 22:57:19 +0000 (14:57 -0800)]
am
dc3fc3dc: Merge "LayoutLib: fix the background of title/action bars." into honeycomb
* commit '
dc3fc3dc2717461113a2963c224cb190457599d8':
LayoutLib: fix the background of title/action bars.
Scott Main [Tue, 8 Feb 2011 21:34:51 +0000 (13:34 -0800)]
Merge "docs: fix links to revised fundamentals documents" into honeycomb
Jason Sams [Tue, 8 Feb 2011 20:07:49 +0000 (12:07 -0800)]
Merge "Fix bug
3421901 remove 2 functions from public headers in the SDK." into honeycomb
Dirk Dougherty [Tue, 8 Feb 2011 19:04:41 +0000 (11:04 -0800)]
Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb
Xavier Ducrohet [Tue, 8 Feb 2011 19:03:43 +0000 (11:03 -0800)]
Merge "LayoutLib: fix the background of title/action bars." into honeycomb
Eric Fischer [Tue, 8 Feb 2011 18:40:47 +0000 (10:40 -0800)]
am
c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
c7bece13495949db1736263a7cf5cf67c6165c51':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:34:23 +0000 (10:34 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Scott Main [Tue, 8 Feb 2011 18:32:12 +0000 (10:32 -0800)]
am
7d9d8efe: cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8 rename SIP doc title
* commit '
7d9d8efebab9bda05cdb7733374723e1e3787d7c':
cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8 rename SIP doc title
Scott Main [Tue, 8 Feb 2011 18:32:08 +0000 (10:32 -0800)]
am
96764812: cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
* commit '
967648121d3857b808941848203dfa44229781d7':
cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
Katie McCormick [Tue, 8 Feb 2011 18:32:05 +0000 (10:32 -0800)]
am
6b311196: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
* commit '
6b31119612a1b357c3675fce0111a1c69a15c2d2':
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
Scott Main [Tue, 8 Feb 2011 18:32:01 +0000 (10:32 -0800)]
am
91e1ae55: cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
* commit '
91e1ae5510c26bc6a7265e0d62ab7bbf83a6251d':
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
Scott Main [Tue, 8 Feb 2011 18:31:57 +0000 (10:31 -0800)]
am
f7a8c0f7: cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a fix broken links, update the dev guide intro, and update sitemap file
* commit '
f7a8c0f78796ebbeb57381b145c0648d7bc6b84a':
cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a fix broken links, update the dev guide intro, and update sitemap file
Scott Main [Tue, 8 Feb 2011 18:31:51 +0000 (10:31 -0800)]
am
c2ab8e41: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 Plus some misc changes to merge from Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6 update OEM driver list with new fujitsu and kyocera
* commit '
c2ab8e41d081395b5b7577ae60ab73e94d7c37e4':
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 Plus some misc changes to merge from Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6 update OEM driver list with new fujitsu and kyocera
Scott Main [Tue, 8 Feb 2011 18:26:11 +0000 (10:26 -0800)]
resolved conflicts for merge of
b7bad4f2 to honeycomb-plus-aosp
Change-Id: Ie672e1d34ca045127e2cf1fcb29dafb5ab998c37
Scott Main [Tue, 8 Feb 2011 17:42:13 +0000 (09:42 -0800)]
am
b68162a9: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit '
b68162a9d6212598a529d63079db15bea6da654c':
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
Scott Main [Tue, 8 Feb 2011 17:38:02 +0000 (09:38 -0800)]
am
4fe9288c: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '
4fe9288c2575e1d9eb300a5da950d6bb6f296ffe':
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
Scott Main [Tue, 8 Feb 2011 05:17:09 +0000 (21:17 -0800)]
resolved conflicts for merge of
9bf45a00 to honeycomb-plus-aosp
Change-Id: I2b2957346a99d5601005831a41033a355df5b163
Dianne Hackborn [Tue, 8 Feb 2011 03:09:33 +0000 (19:09 -0800)]
am
ae91b5ac: Update theme documentation a bit.
* commit '
ae91b5ac7d18e4e461fa42709f51da73d29c403a':
Update theme documentation a bit.
Roman Nurik [Tue, 8 Feb 2011 01:24:33 +0000 (17:24 -0800)]
am
8635908d: Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
* commit '
8635908da1a9f0b3e7ba9bd11ce7104b38f76756':
Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
Roman Nurik [Tue, 8 Feb 2011 01:22:43 +0000 (17:22 -0800)]
Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
Dirk Dougherty [Tue, 8 Feb 2011 01:21:56 +0000 (17:21 -0800)]
Merge "Doc change: Add diff report for api 10." into gingerbread
Scott Main [Tue, 8 Feb 2011 00:39:36 +0000 (16:39 -0800)]
am
62e97010: enable javadoc filtering for api level 11 and disable preview doc mode
* commit '
62e9701099062093af01d7b5d9bdf7f1fe683a31':
enable javadoc filtering for api level 11 and disable preview doc mode
Jason Sams [Mon, 7 Feb 2011 22:17:45 +0000 (14:17 -0800)]
am
f8cbf729: Merge "cleanup headers for SDK. bug
3421901" into honeycomb
* commit '
f8cbf7297bd7e29867154610cbc24fe0dbc168d1':
cleanup headers for SDK. bug
3421901
Jason Sams [Mon, 7 Feb 2011 21:59:45 +0000 (13:59 -0800)]
Merge "cleanup headers for SDK. bug
3421901" into honeycomb
Xavier Ducrohet [Mon, 7 Feb 2011 21:23:20 +0000 (13:23 -0800)]
am
4dd2299d: LayoutLib: Update to latest API fix.
* commit '
4dd2299d5766bf14479578772a0946c5399a0158':
LayoutLib: Update to latest API fix.
Xavier Ducrohet [Mon, 7 Feb 2011 18:22:32 +0000 (10:22 -0800)]
am
62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
* commit '
62a99c0b3bca70262ab205a5688ff69cbbbaee78':
LayoutLib: Handle color state list in methods returning an int.
Xavier Ducrohet [Mon, 7 Feb 2011 18:18:48 +0000 (10:18 -0800)]
Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
Brad Fitzpatrick [Mon, 7 Feb 2011 18:09:29 +0000 (10:09 -0800)]
am
a62bf8bb: am
b901c9ab: am
9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '
a62bf8bb6b7a547802fb384b497e955940befa9c':
Fix a race condition in NativeDaemonConnector
Brad Fitzpatrick [Mon, 7 Feb 2011 18:07:46 +0000 (10:07 -0800)]
am
b901c9ab: am
9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '
b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
Fix a race condition in NativeDaemonConnector
Brad Fitzpatrick [Mon, 7 Feb 2011 18:04:54 +0000 (10:04 -0800)]
am
9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '
9204644d9e8fc2a3d05ff386b14b349f7a117694':
Fix a race condition in NativeDaemonConnector
Brad Fitzpatrick [Mon, 7 Feb 2011 17:55:34 +0000 (09:55 -0800)]
Merge "Fix a race condition in NativeDaemonConnector"
Scott Main [Mon, 7 Feb 2011 17:44:52 +0000 (09:44 -0800)]
am
b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb
* commit '
b0f1cfffd9b201335560c15ffbdcfe12225bac8c':
docs: SearchView is iconified by default
Scott Main [Mon, 7 Feb 2011 17:33:32 +0000 (09:33 -0800)]
Merge "docs: SearchView is iconified by default" into honeycomb
Dianne Hackborn [Mon, 7 Feb 2011 16:02:00 +0000 (08:02 -0800)]
am
6b497a04: am
4b7c1cac: am
bb2e1ef8: Merge "Fixing possible race condition."
* commit '
6b497a0446ebad24305d5e29d5fd5e65014b9778':
Fixing possible race condition.
Dianne Hackborn [Mon, 7 Feb 2011 15:51:34 +0000 (07:51 -0800)]
am
4b7c1cac: am
bb2e1ef8: Merge "Fixing possible race condition."
* commit '
4b7c1cacca252f735d23f7e01885214630d83f32':
Fixing possible race condition.
Dianne Hackborn [Mon, 7 Feb 2011 15:33:38 +0000 (07:33 -0800)]
am
bb2e1ef8: Merge "Fixing possible race condition."
* commit '
bb2e1ef87fe4c5123340035766c759155e6bb90c':
Fixing possible race condition.
Xavier Ducrohet [Sun, 6 Feb 2011 23:15:51 +0000 (15:15 -0800)]
am
83d72da7: Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb
* commit '
83d72da7f69f71fd20bd11fc4f98166532136248':
LayoutLib: improved rendering for system/title/action bars.
Xavier Ducrohet [Sun, 6 Feb 2011 23:13:09 +0000 (15:13 -0800)]
Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb
Robert Ly [Sun, 6 Feb 2011 22:24:56 +0000 (14:24 -0800)]
am
cfc048a3: set targetsdk=11 on renderscript misc samples project
* commit '
cfc048a3f912695f7a251a2266aef59ac4d2d124':
set targetsdk=11 on renderscript misc samples project
Dianne Hackborn [Sun, 6 Feb 2011 17:06:35 +0000 (09:06 -0800)]
Merge "Fixing possible race condition."
Robert Ly [Sun, 6 Feb 2011 08:55:01 +0000 (00:55 -0800)]
am
5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
* commit '
5cf98da85c1698cacbeed8d4883373d0e0774fd8':
Fixing renderscript samples to properly declare targetSDK
Robert Ly [Sun, 6 Feb 2011 08:51:40 +0000 (00:51 -0800)]
Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
Xavier Ducrohet [Sat, 5 Feb 2011 03:33:27 +0000 (19:33 -0800)]
am
35064e5e: Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb
* commit '
35064e5e3a04bda6211166630ccd49d522a8bd92':
LayoutLib: add implementation of Bridge.renderDrawable()
Xavier Ducrohet [Sat, 5 Feb 2011 03:31:38 +0000 (19:31 -0800)]
Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb
Paul Eastham [Sat, 5 Feb 2011 03:23:10 +0000 (19:23 -0800)]
am
be46d145: Revert "Fix for StaticLayout bug with ellipsized text"
* commit '
be46d1456beb7e2f3e8b82bda2d0a5023db3debd':
Revert "Fix for StaticLayout bug with ellipsized text"
Dharmaray Kundargi [Sat, 5 Feb 2011 03:11:55 +0000 (19:11 -0800)]
am
f7f24996: Merge "Fix issue
3426489 Overlay background changed when exported" into honeycomb
* commit '
f7f2499638624392ce7665faba5246c46c5e5634':
Fix issue
3426489 Overlay background changed when exported
Dharmaray Kundargi [Sat, 5 Feb 2011 03:09:20 +0000 (19:09 -0800)]
Merge "Fix issue
3426489 Overlay background changed when exported" into honeycomb
Xavier Ducrohet [Sat, 5 Feb 2011 02:27:30 +0000 (18:27 -0800)]
am
b0d34f9c: LayoutLib: split RenderSession\'s base method into RenderAction.
* commit '
b0d34f9c99cbd43e8238c5952b19d032f02dd168':
LayoutLib: split RenderSession's base method into RenderAction.
Xavier Ducrohet [Sat, 5 Feb 2011 02:05:55 +0000 (18:05 -0800)]
am
1126422e: LayoutLib: update to the new API.
* commit '
1126422ee1f532d8582a4e3b56dbfe505c15e775':
LayoutLib: update to the new API.
Dharmaray Kundargi [Sat, 5 Feb 2011 01:03:47 +0000 (17:03 -0800)]
am
b894f895: Merge "Fix issue
3426200 Movie Studio crashes when a media item is deleted" into honeycomb
* commit '
b894f8959c6be2de5a0c89fedb9824012783dd14':
Fix issue
3426200 Movie Studio crashes when a media item is deleted
Xavier Ducrohet [Sat, 5 Feb 2011 01:03:43 +0000 (17:03 -0800)]
am
3944b784: Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb
* commit '
3944b784e980b5e2cad69b2c8eb5dbc7c1fafc4a':
LayoutLib: Replace custom BitmapFactory by a simpler delegate
Dharmaray Kundargi [Sat, 5 Feb 2011 01:01:51 +0000 (17:01 -0800)]
Merge "Fix issue
3426200 Movie Studio crashes when a media item is deleted" into honeycomb
Xavier Ducrohet [Sat, 5 Feb 2011 01:01:11 +0000 (17:01 -0800)]
Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb
Danny Fernandes [Sat, 5 Feb 2011 00:54:17 +0000 (16:54 -0800)]
am
6ef407c0: Merge "Fixed
3423072 Imported 1080x720 video clips present distorted view" into honeycomb
* commit '
6ef407c0e6e3c178b01e2837e59348f72c97cf8c':
Fixed
3423072 Imported 1080x720 video clips present distorted view
Danny Fernandes [Sat, 5 Feb 2011 00:52:10 +0000 (16:52 -0800)]
Merge "Fixed
3423072 Imported 1080x720 video clips present distorted view" into honeycomb
Eric Laurent [Sat, 5 Feb 2011 00:33:43 +0000 (16:33 -0800)]
am
d4b88c88: Merge "Issue
3395734: fix media server restart detection" into honeycomb
* commit '
d4b88c8829cdababbf16aaf903ba25a1669310e7':
Issue
3395734: fix media server restart detection
Eric Laurent [Sat, 5 Feb 2011 00:30:03 +0000 (16:30 -0800)]
Merge "Issue
3395734: fix media server restart detection" into honeycomb
Kenny Root [Sat, 5 Feb 2011 00:16:19 +0000 (16:16 -0800)]
am
c4dfa998: am
d2a99617: am
c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit '
c4dfa998b7660b9afc4d41b0c940d798f2122fc3':
JPtextinput: Dont break emoji characters when cutting strings.
Jean-Michel Trivi [Sat, 5 Feb 2011 00:12:19 +0000 (16:12 -0800)]
am
c6a5dfd8: Merge "Fix bug
3425610 Reduce lock / unlock sound level" into honeycomb
* commit '
c6a5dfd81384e3937fb7773a206876d5ee8d48ff':
Fix bug
3425610 Reduce lock / unlock sound level
Kenny Root [Sat, 5 Feb 2011 00:12:14 +0000 (16:12 -0800)]
am
d2a99617: am
c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit '
d2a996173e53e7b38ff9b703cc5986d9715508a1':
JPtextinput: Dont break emoji characters when cutting strings.
Scott Main [Sat, 5 Feb 2011 00:10:01 +0000 (16:10 -0800)]
am
c1b638ae: docs: add more info about activating components and change link for broadcasts
* commit '
c1b638ae41495b79d96b76bb8c71c1efb33dacbe':
docs: add more info about activating components and change link for broadcasts
Jean-Michel Trivi [Sat, 5 Feb 2011 00:06:45 +0000 (16:06 -0800)]
Merge "Fix bug
3425610 Reduce lock / unlock sound level" into honeycomb
Kenny Root [Sat, 5 Feb 2011 00:01:13 +0000 (16:01 -0800)]
am
c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit '
c94a99987d8a49ea599c22ffad0e61db591963e0':
JPtextinput: Dont break emoji characters when cutting strings.
Gilles Debunne [Fri, 4 Feb 2011 23:54:19 +0000 (15:54 -0800)]
am
1ba2a47b: (-s ours) am
893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
* commit '
1ba2a47b82b950934ddf04570fb24124aec7f249':
Blinking runnable is created only if text is editable. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:53:44 +0000 (15:53 -0800)]
am
826fbdf7: (-s ours) am
8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
* commit '
826fbdf7b621861f24b71a16fbad53c2ccff1de7':
All runnable are stopped on detach. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:53:37 +0000 (15:53 -0800)]
am
2f7e9d40: (-s ours) am
53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
* commit '
2f7e9d403a8ef6660d3acf8c41f57ce339c9f7cc':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:50:15 +0000 (15:50 -0800)]
am
893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
* commit '
893ac28f75561061a8f334cbd4e47833d7fd7843':
Blinking runnable is created only if text is editable. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:50:12 +0000 (15:50 -0800)]
am
8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
* commit '
8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
All runnable are stopped on detach. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:49:56 +0000 (15:49 -0800)]
am
53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
* commit '
53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:46:15 +0000 (15:46 -0800)]
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:11 +0000 (15:46 -0800)]
Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:06 +0000 (15:46 -0800)]
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
Kenny Root [Fri, 4 Feb 2011 23:42:14 +0000 (15:42 -0800)]
Merge "JPtextinput: Dont break emoji characters when cutting strings."
Trevor Johns [Fri, 4 Feb 2011 23:34:19 +0000 (15:34 -0800)]
am
8d7cc6fa: Merge "Minor updates to Android Market Licensing Service docs." into honeycomb
* commit '
8d7cc6fa8894bc0603534c9933592b96d60a751e':
Minor updates to Android Market Licensing Service docs.
Mike Cleron [Fri, 4 Feb 2011 23:32:08 +0000 (15:32 -0800)]
am
851beae7: Merge "Properly handle dirty rectangles generated from 9-patches Bug #
3409580" into honeycomb
* commit '
851beae717dc8e9b66c214d9d6aab2e76d52b086':
Properly handle dirty rectangles generated from 9-patches Bug #
3409580
Mike Cleron [Fri, 4 Feb 2011 23:32:04 +0000 (15:32 -0800)]
am
2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb
* commit '
2d47fd3c3566e5fbe16bcee2ec4be87c6cdc2440':
Fix crash when Paths are GCd in hw accelerated apps
Trevor Johns [Fri, 4 Feb 2011 23:30:26 +0000 (15:30 -0800)]
Merge "Minor updates to Android Market Licensing Service docs." into honeycomb
Mike Cleron [Fri, 4 Feb 2011 23:29:42 +0000 (15:29 -0800)]
Merge "Properly handle dirty rectangles generated from 9-patches Bug #
3409580" into honeycomb
Mike Cleron [Fri, 4 Feb 2011 23:29:28 +0000 (15:29 -0800)]
Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb
OSDN Git Service
