OSDN Git Service
Scott Main [Mon, 14 Feb 2011 19:46:38 +0000 (11:46 -0800)]
am
b254165a: Merge "docs: fix links" into honeycomb
* commit '
b254165af83849c21276bf832759a38d889cd90e':
docs: fix links
Scott Main [Mon, 14 Feb 2011 19:46:35 +0000 (11:46 -0800)]
am
2e805682: Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb
* commit '
2e80568263924b13c59a24d4d28fecb903bbc2a9':
add compatible-screens manifest element and update supports-screens element with resizeable attribute
Scott Main [Mon, 14 Feb 2011 19:44:49 +0000 (11:44 -0800)]
Merge "docs: fix links" into honeycomb
Scott Main [Mon, 14 Feb 2011 19:44:10 +0000 (11:44 -0800)]
Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb
Joe Malin [Mon, 14 Feb 2011 19:28:52 +0000 (11:28 -0800)]
am
55ee1d66: Merge "DOC CHANGE: Fix bug
3448489 - Monkeyrunner example" into honeycomb
* commit '
55ee1d66981f1edef966562f11c60886138544ea':
DOC CHANGE: Fix bug
3448489 - Monkeyrunner example
Joe Malin [Mon, 14 Feb 2011 19:26:00 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Fix bug
3448489 - Monkeyrunner example" into honeycomb
Scott Main [Mon, 14 Feb 2011 18:34:51 +0000 (10:34 -0800)]
am
ea72329b: docs: update 3.0 version notes
* commit '
ea72329bcc360437d67492bc4f2c82e65e8ba841':
docs: update 3.0 version notes
Joe Malin [Mon, 14 Feb 2011 18:05:46 +0000 (10:05 -0800)]
am
83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
* commit '
83c8b8a3284063c201beccc79f14db6bd715dd82':
Doc Change: Topics for copy/paste/drag/drop
Joe Malin [Mon, 14 Feb 2011 18:03:33 +0000 (10:03 -0800)]
Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
Xavier Ducrohet [Mon, 14 Feb 2011 17:57:17 +0000 (09:57 -0800)]
am
02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.
* commit '
02d2b5a4031c80bfe1012ce2f4f7b3695762abd9':
LayoutLib: When possible ensure parsers are popped from the stack.
Scott Main [Mon, 14 Feb 2011 17:25:30 +0000 (09:25 -0800)]
am
b269346c: am
d4952380: fix md5sum for windows installer
* commit '
b269346ca333a975d37ac50fec0c7b6a4c39a3de':
fix md5sum for windows installer
Scott Main [Mon, 14 Feb 2011 17:14:12 +0000 (09:14 -0800)]
am
d4952380: fix md5sum for windows installer
* commit '
d49523809714b04636a9ac43de1c508ed1dbfc38':
fix md5sum for windows installer
Stephen Hines [Sat, 12 Feb 2011 00:47:04 +0000 (16:47 -0800)]
am
bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
* commit '
bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
Fix struct initializer for balls.
Roman Nurik [Sat, 12 Feb 2011 00:44:52 +0000 (16:44 -0800)]
am
b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
* commit '
b9659336c24ee9be8041132f0d9a1bca3ff6ed36':
Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
Stephen Hines [Sat, 12 Feb 2011 00:44:49 +0000 (16:44 -0800)]
Merge "Fix struct initializer for balls." into honeycomb
Roman Nurik [Sat, 12 Feb 2011 00:43:32 +0000 (16:43 -0800)]
Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
Robert Ly [Sat, 12 Feb 2011 00:30:15 +0000 (16:30 -0800)]
am
ccea5d27: Doc change: tools, adt, ndk release notes
* commit '
ccea5d27d37636db2669abec8a854fbd923440da':
Doc change: tools, adt, ndk release notes
Roman Nurik [Fri, 11 Feb 2011 23:42:57 +0000 (15:42 -0800)]
am
94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
* commit '
94be4a5e1ad833d7e5d0dbed29b806ba8fd5409e':
Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
Adam Cohen [Fri, 11 Feb 2011 23:23:27 +0000 (15:23 -0800)]
am
5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
* commit '
5a1b63572bf52142aa880cccc92636e65600bb60':
Adding StackWidget sample code
Adam Cohen [Fri, 11 Feb 2011 23:19:38 +0000 (15:19 -0800)]
Merge "Adding StackWidget sample code" into honeycomb
Winson Chung [Fri, 11 Feb 2011 23:15:33 +0000 (15:15 -0800)]
am
5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb
* commit '
5f3cd3eabb7bcf8a293f84e84b0acbef682d3c88':
Associated changes for 'Adding sample for collection widgets backed by content providers.'
Winson Chung [Fri, 11 Feb 2011 23:07:06 +0000 (15:07 -0800)]
Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb
Robert Ly [Fri, 11 Feb 2011 21:49:09 +0000 (13:49 -0800)]
resolved conflicts for merge of
810c1c0c to honeycomb-plus-aosp
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
Robert Ly [Fri, 11 Feb 2011 21:18:41 +0000 (13:18 -0800)]
am
2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
* commit '
2be58282746de92773f6423d4ae55a2ef4e5f226':
Doc change: updating animation framework topic
Robert Ly [Fri, 11 Feb 2011 21:18:33 +0000 (13:18 -0800)]
am
997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
* commit '
997a671368c3b9f66f3a415876aaa94b391ab602':
Doc change: renderscript dev guide
Robert Ly [Fri, 11 Feb 2011 21:18:31 +0000 (13:18 -0800)]
am
322891c6: Doc change: nfc dev guide
* commit '
322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
Robert Ly [Fri, 11 Feb 2011 21:15:55 +0000 (13:15 -0800)]
Merge "Doc change: updating animation framework topic" into honeycomb
Robert Ly [Fri, 11 Feb 2011 21:15:35 +0000 (13:15 -0800)]
Merge "Doc change: renderscript dev guide" into honeycomb
James Dong [Fri, 11 Feb 2011 19:56:33 +0000 (11:56 -0800)]
am
f9e7442a: Update sample code in documentation
* commit '
f9e7442a0c0c7efc70d13fa9330baa797316154a':
Update sample code in documentation
Jean-Baptiste Queru [Fri, 11 Feb 2011 18:16:45 +0000 (10:16 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 18:04:53 +0000 (10:04 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:54:59 +0000 (09:54 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:39:46 +0000 (09:39 -0800)]
Merge "stubs"
Steve Block [Fri, 11 Feb 2011 00:04:48 +0000 (16:04 -0800)]
stubs
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
Jason Sams [Thu, 10 Feb 2011 23:08:41 +0000 (15:08 -0800)]
am
cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
* commit '
cbcd93352b9fff3ada4a01c3094b24e5fafde97f':
Basic 101 level compute example for RS.
Mathias Agopian [Thu, 10 Feb 2011 23:08:33 +0000 (15:08 -0800)]
am
b66b7a2c: Merge "fix [
3408713] Dialog window invisible sometimes" into honeycomb
* commit '
b66b7a2c183a1423ea629d4f73ed95f9b87d54b7':
fix [
3408713] Dialog window invisible sometimes
Dirk Dougherty [Thu, 10 Feb 2011 23:08:28 +0000 (15:08 -0800)]
am
12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb
* commit '
12244c57960d85a066c94774e3e37685d0081213':
Doc change: changes for 3.0 SDK
Robert Ly [Thu, 10 Feb 2011 23:08:18 +0000 (15:08 -0800)]
am
bbdc4ce2: Merge "clean up and add javadocs" into honeycomb
* commit '
bbdc4ce254e4918f771e448cd4fa9602679eaf2b':
clean up and add javadocs
Alex Sakhartchouk [Thu, 10 Feb 2011 23:08:14 +0000 (15:08 -0800)]
am
efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
* commit '
efc48eea1541990046248b86e899c72b58c8506f':
HelloWorld graphics sample for Renderscript.
Alex Sakhartchouk [Thu, 10 Feb 2011 23:07:59 +0000 (15:07 -0800)]
am
f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
* commit '
f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
Cleanup of the code in view to do creation/destruction in the right places.
Jean-Baptiste Queru [Thu, 10 Feb 2011 22:48:53 +0000 (14:48 -0800)]
Ignore
a8d3f02a from honeycomb - already there
Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
Gilles Debunne [Thu, 10 Feb 2011 22:43:35 +0000 (14:43 -0800)]
resolved conflicts for merge of
8e28ab22 to honeycomb-plus-aosp
Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b
Wink Saville [Thu, 10 Feb 2011 21:53:10 +0000 (13:53 -0800)]
am
bdce3d2c: am
01a5eba8: am
6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '
bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
Telephony: Fix cb sms implementation
Mathias Agopian [Thu, 10 Feb 2011 21:53:01 +0000 (13:53 -0800)]
am
d0f27f43: am
ada1b6f2: Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
* commit '
d0f27f435eb8a2c7e5841da68760d1f023fcf919':
fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep
Scott Main [Thu, 10 Feb 2011 21:52:57 +0000 (13:52 -0800)]
am
b605869c: am
07cefd3c: add 2.3.3 announcement to site home page
* commit '
b605869cd36c7498ca99cc00bad5d0dfbf237c43':
add 2.3.3 announcement to site home page
Jeff Hamilton [Thu, 10 Feb 2011 21:52:48 +0000 (13:52 -0800)]
am
c1cc9ba6: am
58c9d472: Merge "More documentation updates for NFC." into gingerbread
* commit '
c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
More documentation updates for NFC.
Dirk Dougherty [Thu, 10 Feb 2011 21:52:40 +0000 (13:52 -0800)]
am
8d56f6de: am
a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit '
8d56f6decf9efd29b286e02c549510d681b7573d':
Doc change: Add version notes for Android 2.3.3.
Nick Pelly [Thu, 10 Feb 2011 21:52:34 +0000 (13:52 -0800)]
am
47dac545: am
39cf3a44: Document NFC permissions.
* commit '
47dac545da6468e5b46e940917eb6711c02b8e84':
Document NFC permissions.
Jeff Hamilton [Thu, 10 Feb 2011 21:52:23 +0000 (13:52 -0800)]
am
1ac35411: am
584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '
1ac35411f186dca346e8d9078a4fd2d570bb8a97':
Improve the docs a bit for foreground dispatch.
Eric Fischer [Thu, 10 Feb 2011 21:50:51 +0000 (13:50 -0800)]
am
c1c31433: (-s ours) am
be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
c1c314334757e0ab3c244023aec1b24433b66b48':
Import revised translations. DO NOT MERGE
Scott Main [Thu, 10 Feb 2011 21:50:44 +0000 (13:50 -0800)]
am
129c7372: am
3c01a139: rename SIP doc title
* commit '
129c73723f2241f762f485a9b5421bfae3cbbdcd':
rename SIP doc title
Scott Main [Thu, 10 Feb 2011 21:47:32 +0000 (13:47 -0800)]
resolved conflicts for merge of
42f18194 to honeycomb-plus-aosp
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
Jason Sams [Thu, 10 Feb 2011 21:06:16 +0000 (13:06 -0800)]
Merge "Basic 101 level compute example for RS." into honeycomb
Katie McCormick [Thu, 10 Feb 2011 20:38:07 +0000 (12:38 -0800)]
resolved conflicts for merge of
690d31a6 to honeycomb-plus-aosp
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
Mathias Agopian [Thu, 10 Feb 2011 20:29:19 +0000 (12:29 -0800)]
Merge "fix [
3408713] Dialog window invisible sometimes" into honeycomb
Dirk Dougherty [Thu, 10 Feb 2011 20:02:38 +0000 (12:02 -0800)]
Merge "Doc change: changes for 3.0 SDK" into honeycomb
Robert Ly [Thu, 10 Feb 2011 18:15:14 +0000 (10:15 -0800)]
Merge "clean up and add javadocs" into honeycomb
Alex Sakhartchouk [Thu, 10 Feb 2011 17:53:30 +0000 (09:53 -0800)]
Merge "HelloWorld graphics sample for Renderscript." into honeycomb
Alex Sakhartchouk [Thu, 10 Feb 2011 17:51:34 +0000 (09:51 -0800)]
Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
Mathias Agopian [Thu, 10 Feb 2011 02:38:55 +0000 (18:38 -0800)]
fix [
3408713] Dialog window invisible sometimes
weak pointer comparison operators were implemented wrong,
they were using the internal "unsafe" pointer. We could end up
with two "equal" weak pointer pointing to different objects.
this caused KeyedVector keyed by weak pointer to work incorrectly, in
turn causing a window that just got added to a list to be immediately
removed.
Change-Id: Ib191010c39aafa9229109e4211f6c3b2b2f9696d
Gilles Debunne [Thu, 10 Feb 2011 00:49:42 +0000 (16:49 -0800)]
am
2050de5b: Text selection is broken.
* commit '
2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
Alex Sakhartchouk [Wed, 9 Feb 2011 23:23:54 +0000 (15:23 -0800)]
am
699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
* commit '
699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
DO NOT MERGE Removing an activity that shouldn't go into samples
Dirk Dougherty [Wed, 9 Feb 2011 23:21:49 +0000 (15:21 -0800)]
am
0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
* commit '
0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
Doc change: add diff report for API 11
Alex Sakhartchouk [Wed, 9 Feb 2011 23:20:21 +0000 (15:20 -0800)]
Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb
Dirk Dougherty [Wed, 9 Feb 2011 23:19:08 +0000 (15:19 -0800)]
Merge "Doc change: add diff report for API 11" into honeycomb
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.
Wink Saville [Wed, 9 Feb 2011 21:45:37 +0000 (13:45 -0800)]
am
01a5eba8: am
6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '
01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
Wink Saville [Wed, 9 Feb 2011 21:42:45 +0000 (13:42 -0800)]
am
6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '
6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
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
Wink Saville [Wed, 9 Feb 2011 21:09:24 +0000 (13:09 -0800)]
Merge "Telephony: Fix cb sms implementation"
Mathias Agopian [Wed, 9 Feb 2011 21:09:12 +0000 (13:09 -0800)]
am
ada1b6f2: Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
* commit '
ada1b6f297596cac4451edbc83df060a31cdda68':
fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep
Mathias Agopian [Wed, 9 Feb 2011 21:06:00 +0000 (13:06 -0800)]
Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
Scott Main [Wed, 9 Feb 2011 21:03:11 +0000 (13:03 -0800)]
am
07cefd3c: add 2.3.3 announcement to site home page
* commit '
07cefd3cc3d8d27750e4fc725d9aec86250750dd':
add 2.3.3 announcement to site home page
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
Jeff Hamilton [Wed, 9 Feb 2011 08:36:53 +0000 (00:36 -0800)]
am
58c9d472: Merge "More documentation updates for NFC." into gingerbread
* commit '
58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
More documentation updates for NFC.
Jeff Hamilton [Wed, 9 Feb 2011 08:34:22 +0000 (00:34 -0800)]
Merge "More documentation updates for NFC." into gingerbread
Dirk Dougherty [Wed, 9 Feb 2011 07:27:53 +0000 (23:27 -0800)]
am
a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit '
a3f53afd13bc1722464e169cb82a01d3898852b5':
Doc change: Add version notes for Android 2.3.3.
Nick Pelly [Wed, 9 Feb 2011 07:25:29 +0000 (23:25 -0800)]
am
39cf3a44: Document NFC permissions.
* commit '
39cf3a445e507f219ecc8a476f6038f095d9d520':
Document NFC permissions.
Dirk Dougherty [Wed, 9 Feb 2011 07:24:22 +0000 (23:24 -0800)]
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
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
Jeff Hamilton [Wed, 9 Feb 2011 03:33:53 +0000 (19:33 -0800)]
am
584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '
584afa8dde1777b181e773a491416769f25607a8':
Improve the docs a bit for foreground dispatch.
Jeff Hamilton [Wed, 9 Feb 2011 03:30:47 +0000 (19:30 -0800)]
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
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
Eric Fischer [Wed, 9 Feb 2011 01:32:18 +0000 (17:32 -0800)]
am
be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
be4b39d2fde3d34539752b99238ceebd97ccf580':
Import revised translations. DO NOT MERGE
Scott Main [Wed, 9 Feb 2011 01:32:14 +0000 (17:32 -0800)]
am
3c01a139: rename SIP doc title
* commit '
3c01a139f0d8ece0e300be26ac41280f1e934747':
rename SIP doc title
Scott Main [Wed, 9 Feb 2011 01:32:06 +0000 (17:32 -0800)]
am
c442bc60: docs: move the SIP guide into guide/network/
* commit '
c442bc605c80a2900a0ed41345f53d218288de7a':
docs: move the SIP guide into guide/network/
Katie McCormick [Wed, 9 Feb 2011 01:31:59 +0000 (17:31 -0800)]
am
7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
* commit '
7134520b2635474c5e7f4902c26e12d0ffcc9c64':
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
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
OSDN Git Service
