OSDN Git Service
Svetoslav Ganov [Fri, 25 Feb 2011 20:39:59 +0000 (12:39 -0800)]
resolved conflicts for merge of
66edf2bb to honeycomb-plus-aosp
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
Svetoslav Ganov [Fri, 25 Feb 2011 08:09:03 +0000 (00:09 -0800)]
am
9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread
* commit '
9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
Use different version of CLDR data in DatePicker
Svetoslav Ganov [Fri, 25 Feb 2011 07:56:52 +0000 (23:56 -0800)]
Merge "Use different version of CLDR data in DatePicker" into gingerbread
Jeff Hamilton [Fri, 25 Feb 2011 04:43:15 +0000 (20:43 -0800)]
am
fd34aa8e: am
5644d0e1: Support for NDEF on iCODE.
* commit '
fd34aa8e1386547bcfbaf043f26c054946b92c2b':
Support for NDEF on iCODE.
Jeff Hamilton [Fri, 25 Feb 2011 04:30:14 +0000 (20:30 -0800)]
am
5644d0e1: Support for NDEF on iCODE.
* commit '
5644d0e18ad847b66a8cb4f185cb28edebe75d88':
Support for NDEF on iCODE.
Robert Ly [Fri, 25 Feb 2011 02:13:43 +0000 (18:13 -0800)]
am
b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb
* commit '
b7a8c1e781517b5c6b47ee2b0c7bd0e70d9a1880':
Doc change: fixing errors in library proj docs
Robert Ly [Fri, 25 Feb 2011 02:07:28 +0000 (18:07 -0800)]
Merge "Doc change: fixing errors in library proj docs" into honeycomb
Robert Ly [Fri, 25 Feb 2011 02:02:58 +0000 (18:02 -0800)]
am
00e08463: Doc change: clarifying nfc tech filter usage
* commit '
00e08463cb8df0969e71fd731a4e078680c4f2b5':
Doc change: clarifying nfc tech filter usage
Xavier Ducrohet [Fri, 25 Feb 2011 01:24:07 +0000 (17:24 -0800)]
am
db1acf52: (-s ours) am
1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit '
db1acf52bb6e4b949bcef09f903d662aed9b8a3a':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Xavier Ducrohet [Fri, 25 Feb 2011 01:19:38 +0000 (17:19 -0800)]
resolved conflicts for merge of
86e43034 to honeycomb-plus-aosp
Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce
Xavier Ducrohet [Fri, 25 Feb 2011 00:21:41 +0000 (16:21 -0800)]
am
1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit '
1175ef7e2e4f68532d8ade672d7f5502d9946ce4':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Xavier Ducrohet [Fri, 25 Feb 2011 00:15:11 +0000 (16:15 -0800)]
resolved conflicts for merge of
a4350fc0 to gingerbread-plus-aosp
Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
Xavier Ducrohet [Thu, 24 Feb 2011 22:44:58 +0000 (14:44 -0800)]
Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
Xavier Ducrohet [Thu, 24 Feb 2011 22:44:52 +0000 (14:44 -0800)]
Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread
Eric Fischer [Thu, 24 Feb 2011 19:18:56 +0000 (11:18 -0800)]
am
1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
1c38872fd30d7b19a01cc309537e911e7f2344e9':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 24 Feb 2011 19:15:53 +0000 (11:15 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Wink Saville [Thu, 24 Feb 2011 18:50:31 +0000 (10:50 -0800)]
am
0dc8618d: Do not start RILReceiver if wifi-only.
* commit '
0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
Do not start RILReceiver if wifi-only.
repo sync [Thu, 24 Feb 2011 18:26:49 +0000 (10:26 -0800)]
am
be2ed6d6: resolved conflicts for merge of
c96b6690 to gingerbread-plus-aosp
* commit '
be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=
d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=
3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
repo sync [Thu, 24 Feb 2011 17:58:25 +0000 (09:58 -0800)]
resolved conflicts for merge of
c96b6690 to gingerbread-plus-aosp
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
Alon Albert [Thu, 24 Feb 2011 17:20:46 +0000 (09:20 -0800)]
Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=
d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug b/issue?id=
3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread
Jason Chen [Thu, 24 Feb 2011 02:08:23 +0000 (18:08 -0800)]
am
22577b8d: (-s ours) am
5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '
22577b8d3a39c1373594ba3e4427212eee4cd6d4':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
Jason Chen [Thu, 24 Feb 2011 02:03:34 +0000 (18:03 -0800)]
am
5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '
5ff79c3b06d7087153617dc973491fc890700af5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
Irfan Sheriff [Thu, 24 Feb 2011 02:02:45 +0000 (18:02 -0800)]
am
5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '
5107eea64e46b0fffbbbcefa469a88044f309de6':
DO NOT MERGE Add support for background scanning
Jason Chen [Thu, 24 Feb 2011 01:23:53 +0000 (17:23 -0800)]
Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
Irfan Sheriff [Thu, 24 Feb 2011 00:59:55 +0000 (16:59 -0800)]
Merge "DO NOT MERGE Add support for background scanning" into honeycomb
Scott Main [Thu, 24 Feb 2011 00:00:08 +0000 (16:00 -0800)]
am
201959af: Merge "docs: fix sensorevent code snippets bug:
3480932" into honeycomb
* commit '
201959af6e61c148576c77de6cf772456d664251':
docs: fix sensorevent code snippets bug:
3480932
Scott Main [Wed, 23 Feb 2011 23:58:13 +0000 (15:58 -0800)]
Merge "docs: fix sensorevent code snippets bug:
3480932" into honeycomb
Eric Fischer [Wed, 23 Feb 2011 23:36:08 +0000 (15:36 -0800)]
am
32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
32751e3175d8dca96d75b6c93a32557c259c13a7':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 23 Feb 2011 23:33:12 +0000 (15:33 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Irfan Sheriff [Wed, 23 Feb 2011 22:38:10 +0000 (14:38 -0800)]
am
a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit '
a46a5cba276ee269d227a5e4d69f3891c4349edf':
DO NOT MERGE No backup of country and sleep policy
Irfan Sheriff [Wed, 23 Feb 2011 22:35:20 +0000 (14:35 -0800)]
Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
Scott Main [Wed, 23 Feb 2011 22:17:30 +0000 (14:17 -0800)]
am
c516c771: docs: fix md5 sums
* commit '
c516c7714d9cdc996053fd2a130015cbde978242':
docs: fix md5 sums
Jamie Gennis [Wed, 23 Feb 2011 21:31:12 +0000 (13:31 -0800)]
am
76d0c763: (-s ours) am
fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit '
76d0c763f008d19791e13ebabe9ec83958354bc5':
egl: fixes for object refcounts
Jamie Gennis [Wed, 23 Feb 2011 20:46:57 +0000 (12:46 -0800)]
am
fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit '
fa238f033203f8e722b060af3f0095762b134f37':
egl: fixes for object refcounts
Jamie Gennis [Wed, 23 Feb 2011 20:30:55 +0000 (12:30 -0800)]
Merge "egl: fixes for object refcounts" into gingerbread
Scott Main [Wed, 23 Feb 2011 19:24:42 +0000 (11:24 -0800)]
am
2788e4f9: docs: fix some typos
* commit '
2788e4f96a3f210192145a340a1d072c70c7bc4f':
docs: fix some typos
Justin Ho [Wed, 23 Feb 2011 05:23:54 +0000 (21:23 -0800)]
am
da34ab21: am
9208875e: Updated iconography for network status and adding 4G assets
* commit '
da34ab214886531e5e9c0d975d0dc70cfe8a26a4':
Updated iconography for network status and adding 4G assets
Alon Albert [Wed, 23 Feb 2011 05:23:50 +0000 (21:23 -0800)]
am
1aba843d: am
ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit '
1aba843dc327490a749059bcddff90e8048ed75c':
Support quoted parameters
Justin Ho [Wed, 23 Feb 2011 05:19:05 +0000 (21:19 -0800)]
am
9208875e: Updated iconography for network status and adding 4G assets
* commit '
9208875e92ec190d49864b92823dd7011b9b443a':
Updated iconography for network status and adding 4G assets
Alon Albert [Wed, 23 Feb 2011 05:18:52 +0000 (21:18 -0800)]
am
ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit '
ccc802e12be64248c2c6822eb36a957435a06ef2':
Support quoted parameters
Robert Ly [Wed, 23 Feb 2011 05:15:28 +0000 (21:15 -0800)]
am
c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb
* commit '
c6c6fe939c83e644b7626f6d3f3be25883af1583':
doc change: fix missing code ending tag
Scott Main [Wed, 23 Feb 2011 05:15:23 +0000 (21:15 -0800)]
am
47928f89: Merge "docs: fix broken links" into honeycomb
* commit '
47928f898d81625cb1e66eea9eb6120f719e89ee':
docs: fix broken links
James Dong [Wed, 23 Feb 2011 05:15:19 +0000 (21:15 -0800)]
am
6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit '
6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
Scott Main [Wed, 23 Feb 2011 05:15:15 +0000 (21:15 -0800)]
am
0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb
* commit '
0ea4f0d79126e953a87604162c1b9a9e91ffbb1f':
docs: update highlights doc to remove preview
Scott Main [Wed, 23 Feb 2011 05:15:09 +0000 (21:15 -0800)]
am
9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
* commit '
9d5f35d9e0e406bd9e109879db890e361e137929':
docs: add breadcrumb trails to some docs, mostly manifest docs
Roman Nurik [Wed, 23 Feb 2011 05:15:03 +0000 (21:15 -0800)]
am
cba8efdf: Add more tags to the RenderScript sample listing.
* commit '
cba8efdff8a77b159f259d973b05d508a61206e1':
Add more tags to the RenderScript sample listing.
Dirk Dougherty [Wed, 23 Feb 2011 05:14:58 +0000 (21:14 -0800)]
am
7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
* commit '
7036d76a6e172de300c63cb9c33b65a63fe7ce0f':
Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.
Roman Nurik [Wed, 23 Feb 2011 05:14:52 +0000 (21:14 -0800)]
am
4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb
* commit '
4f4cab75cc0dff361d181299f07a233e8bb1e1c0':
Document support for WebM/VP8 decoding.
Nick Pelly [Wed, 23 Feb 2011 05:14:46 +0000 (21:14 -0800)]
am
beb01c93: Merge "DO NOT MERGE." into honeycomb
* commit '
beb01c93f9bed3dd36fc8ee63a8a7ab8d6ec9c70':
DO NOT MERGE.
Scott Main [Wed, 23 Feb 2011 05:14:40 +0000 (21:14 -0800)]
am
4d62ef25: docs: revert ndk r6
* commit '
4d62ef259568a050e0103a9beff702f0edd03f61':
docs: revert ndk r6
Scott Main [Wed, 23 Feb 2011 05:14:34 +0000 (21:14 -0800)]
am
f870c5af: docs: add new-child tags to hide the "new" tag when a parent list item is expanded
* commit '
f870c5af7ac45d1c865bb2de5696f45c24ac396d':
docs: add new-child tags to hide the "new" tag when a parent list item is expanded
Scott Main [Wed, 23 Feb 2011 05:14:15 +0000 (21:14 -0800)]
am
1f694390: docs: move 3.0 optimizing doc into the dev guide
* commit '
1f694390225b462f76d580fb150fb0a07585df48':
docs: move 3.0 optimizing doc into the dev guide
Michael I. Gold [Thu, 23 Dec 2010 21:51:36 +0000 (13:51 -0800)]
egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug:
2964479
Robert Ly [Wed, 23 Feb 2011 00:57:06 +0000 (16:57 -0800)]
Merge "doc change: fix missing code ending tag" into honeycomb
Scott Main [Wed, 23 Feb 2011 00:49:32 +0000 (16:49 -0800)]
Merge "docs: fix broken links" into honeycomb
James Dong [Wed, 23 Feb 2011 00:41:29 +0000 (16:41 -0800)]
Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
Scott Main [Tue, 22 Feb 2011 23:36:31 +0000 (15:36 -0800)]
Merge "docs: update highlights doc to remove preview" into honeycomb
Scott Main [Tue, 22 Feb 2011 23:14:39 +0000 (15:14 -0800)]
Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
Maarten Hooft [Tue, 22 Feb 2011 22:48:40 +0000 (14:48 -0800)]
am
62f40c8b: (-s ours) am
99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
62f40c8bcf78ac872a01aee8840b808b5aeea1d8':
Import revised translations. DO NOT MERGE
Romain Guy [Tue, 22 Feb 2011 22:48:21 +0000 (14:48 -0800)]
am
ad492161: am
a2090bea: am
7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '
ad492161e4384efe11daec60cd14902f6b2c662a':
Fix for #12945: ProgressBar.setMax() will always redraw.
Dirk Dougherty [Tue, 22 Feb 2011 20:47:25 +0000 (12:47 -0800)]
Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
Roman Nurik [Tue, 22 Feb 2011 20:43:15 +0000 (12:43 -0800)]
Merge "Document support for WebM/VP8 decoding." into honeycomb
Alon Albert [Tue, 22 Feb 2011 18:31:26 +0000 (10:31 -0800)]
Merge "Support quoted parameters" into gingerbread
Nick Pelly [Tue, 22 Feb 2011 17:10:32 +0000 (09:10 -0800)]
Merge "DO NOT MERGE." into honeycomb
Dirk Dougherty [Sun, 20 Feb 2011 02:07:20 +0000 (18:07 -0800)]
am
301431d9: Doc change: Final diff report for API 11.
* commit '
301431d96e85e37d1dc2dd0df88f894dda0f5404':
Doc change: Final diff report for API 11.
Scott Main [Sat, 19 Feb 2011 03:42:29 +0000 (19:42 -0800)]
resolved conflicts for merge of
b842629c to honeycomb-plus-aosp
Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6
Maarten Hooft [Fri, 18 Feb 2011 23:22:48 +0000 (15:22 -0800)]
am
99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
99cca89f41e500f8b39fd75eb17f337422c4ac90':
Import revised translations. DO NOT MERGE
Scott Main [Fri, 18 Feb 2011 23:11:14 +0000 (15:11 -0800)]
am
e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
* commit '
e4da39345209c47b2736f266adfc22a0fdb4c716':
docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools
Scott Main [Fri, 18 Feb 2011 23:08:26 +0000 (15:08 -0800)]
Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
Scott Main [Fri, 18 Feb 2011 18:40:59 +0000 (10:40 -0800)]
am
163413f4: Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
* commit '
163413f4360af8a8b010fa69a131fb0177df96a7':
docs: update getting started doc for 3.0; move out of preview docs
Scott Main [Fri, 18 Feb 2011 18:26:41 +0000 (10:26 -0800)]
Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
Romain Guy [Fri, 18 Feb 2011 16:06:01 +0000 (08:06 -0800)]
am
a2090bea: am
7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '
a2090bea4824cf153c4d9c735ee779613cf2e3d7':
Fix for #12945: ProgressBar.setMax() will always redraw.
Romain Guy [Fri, 18 Feb 2011 15:53:50 +0000 (07:53 -0800)]
am
7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '
7118bdec523568842e70555e353951df9f2596fd':
Fix for #12945: ProgressBar.setMax() will always redraw.
Romain Guy [Fri, 18 Feb 2011 06:40:33 +0000 (22:40 -0800)]
Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
Robert Ly [Fri, 18 Feb 2011 04:21:35 +0000 (20:21 -0800)]
am
a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb
* commit '
a58f58daf94caa7e50c04707a67ba1a9dacb0a9c':
Doc change: fixing renderscript samples
Scott Main [Fri, 18 Feb 2011 04:21:24 +0000 (20:21 -0800)]
am
0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
* commit '
0ddd2d1ea7cda544efc4d25601e1cdc0236e44d8':
DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
Robert Ly [Fri, 18 Feb 2011 02:53:36 +0000 (18:53 -0800)]
Merge "Doc change: fixing renderscript samples" into honeycomb
Maarten Hooft [Fri, 18 Feb 2011 01:17:40 +0000 (17:17 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Joe Malin [Thu, 17 Feb 2011 21:18:30 +0000 (13:18 -0800)]
am
e766fcd5: DOC CHANGE: Bug
3396898 add attribute uses-library
* commit '
e766fcd5e967c2400a1fe90a4a01e4f0a12dbd1d':
DOC CHANGE: Bug
3396898 add attribute uses-library
Andreas Huber [Wed, 16 Feb 2011 22:28:01 +0000 (14:28 -0800)]
am
79a97489: (-s ours) am
dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '
79a97489494deb8bdae85696f612ec7acda54240':
DO NOT MERGE: Respond to RTSP server->client requests.
Andreas Huber [Wed, 16 Feb 2011 22:24:53 +0000 (14:24 -0800)]
am
dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '
dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
DO NOT MERGE: Respond to RTSP server->client requests.
Scott Main [Wed, 16 Feb 2011 20:41:53 +0000 (12:41 -0800)]
am
0643d7c4: docs: add new tag for tasks doc
* commit '
0643d7c442f975efa35c9e3729d74555627a32b5':
docs: add new tag for tasks doc
Andy Stadler [Wed, 16 Feb 2011 20:20:36 +0000 (12:20 -0800)]
am
b1835085: Merge "@hide DPM global proxy settings" into honeycomb
* commit '
b18350851633b1d3717f2484d27b76aa64788ce1':
@hide DPM global proxy settings
Andy Stadler [Wed, 16 Feb 2011 20:18:39 +0000 (12:18 -0800)]
Merge "@hide DPM global proxy settings" into honeycomb
Scott Main [Wed, 16 Feb 2011 20:08:36 +0000 (12:08 -0800)]
resolved conflicts for merge of
f722cecd to honeycomb-plus-aosp
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
Scott Main [Wed, 16 Feb 2011 19:58:40 +0000 (11:58 -0800)]
Merge "docs: update homepage for 3.0 announcement" into honeycomb
Robert Greenwalt [Wed, 16 Feb 2011 18:55:54 +0000 (10:55 -0800)]
am
de27b519: (-s ours) am
3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '
de27b519588ed46c0ba601a489c01d26ec31757d':
DO NOT MERGE - backport of l92a02b31 from master
Robert Greenwalt [Wed, 16 Feb 2011 18:51:04 +0000 (10:51 -0800)]
am
3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '
3259d8853760a72b811757e1711119d041962a1c':
DO NOT MERGE - backport of l92a02b31 from master
Robert Greenwalt [Wed, 16 Feb 2011 18:44:26 +0000 (10:44 -0800)]
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Eric Fischer [Wed, 16 Feb 2011 18:38:11 +0000 (10:38 -0800)]
am
874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:33:18 +0000 (10:33 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Alon Albert [Wed, 16 Feb 2011 18:26:53 +0000 (10:26 -0800)]
am
b79db4cd: (-s ours) am
be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit '
b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
DO NOT MERGE - Clear backoffs on reconnect
Alon Albert [Wed, 16 Feb 2011 18:24:15 +0000 (10:24 -0800)]
am
be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit '
be5f82ab0ddacea3846cfa5aa846d1c97def0318':
DO NOT MERGE - Clear backoffs on reconnect
Scott Main [Wed, 16 Feb 2011 18:23:05 +0000 (10:23 -0800)]
am
796ce77a: docs: add breadcrumbs to articles and tutorials
* commit '
796ce77abf3d1d006576490c286e72ebf0736280':
docs: add breadcrumbs to articles and tutorials
Alon Albert [Wed, 16 Feb 2011 18:20:13 +0000 (10:20 -0800)]
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
daniel_tomas [Wed, 16 Feb 2011 17:43:08 +0000 (09:43 -0800)]
am
99e267eb: am
7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '
99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
New API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Wed, 16 Feb 2011 17:41:00 +0000 (09:41 -0800)]
am
7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '
7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
New API added in NfcAdapter to enable/disable SE card emulation
Nick Pelly [Wed, 16 Feb 2011 17:25:09 +0000 (09:25 -0800)]
am
8c8e9d9a: am
1df862a4: Minor doc update.
* commit '
8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
Minor doc update.
Nick Pelly [Wed, 16 Feb 2011 17:23:08 +0000 (09:23 -0800)]
am
1df862a4: Minor doc update.
* commit '
1df862a4656bb0d7a3329311b1e243fc6db32448':
Minor doc update.
Scott Main [Wed, 16 Feb 2011 17:21:06 +0000 (09:21 -0800)]
am
f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
* commit '
f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9':
docs: edit doc titles to match side nav and add breadcrumb links
OSDN Git Service
