OSDN Git Service
Lorenzo Colitti [Sat, 5 Feb 2011 01:41:11 +0000 (17:41 -0800)]
Merge "Add a protocol property to the APNs and use it."
Wink Saville [Fri, 4 Feb 2011 23:04:38 +0000 (15:04 -0800)]
Merge "Fix SETUP_DATA_CALL handling."
Glenn Kasten [Fri, 4 Feb 2011 22:00:17 +0000 (14:00 -0800)]
Merge "Bug
3366668 Use BinderService template"
Andreas Huber [Fri, 4 Feb 2011 18:21:15 +0000 (10:21 -0800)]
Merge "Ignore format change message in sf2 instead of asserting"
Andreas Huber [Fri, 4 Feb 2011 18:21:07 +0000 (10:21 -0800)]
Merge "Improvements/fixes to ACodec."
Robert Greenwalt [Fri, 4 Feb 2011 18:16:22 +0000 (10:16 -0800)]
Merge "Place the DHCP server address in the "next server IP address" field of the bootp header. A certain Apple client likes this, and it is more consistent with other DHCP servers."
Glenn Kasten [Fri, 4 Feb 2011 02:44:32 +0000 (18:44 -0800)]
Merge "Bug
3366885 Remove LVMX switch"
Jean-Baptiste Queru [Fri, 4 Feb 2011 02:09:36 +0000 (18:09 -0800)]
Jean-Baptiste Queru [Fri, 4 Feb 2011 02:09:26 +0000 (18:09 -0800)]
am
5086c457: am
baaaca1c: Merge
ee4c17ee from gingerbread
* commit '
5086c45718a8344fb36adf5b15e98953612cac37':
Fix delivery report error with PENDING status in SMS
Justin Ho [Fri, 4 Feb 2011 02:09:00 +0000 (18:09 -0800)]
am
b7fa0b65: am
ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb
* commit '
b7fa0b65d789464f67b00d5975a9bc26460ce63c':
Revert "Sounds cleanup"
Vasu Nori [Fri, 4 Feb 2011 02:08:44 +0000 (18:08 -0800)]
am
9ec496b4: am
e1cbd0a8: Revert "Merge "bug:
3414192 new API to designate a download to be OTA update" into honeycomb"
* commit '
9ec496b484305defa6cbb691b85836ace8b73a02':
Revert "Merge "bug:
3414192 new API to designate a download to be OTA update" into honeycomb"
Michael Jurka [Fri, 4 Feb 2011 02:08:17 +0000 (18:08 -0800)]
am
d51e0820: am
8275c608: Merge "adding fast setters for translationx/y" into honeycomb
* commit '
d51e0820b3b7a71f2b3e0447bdf05188588c6003':
adding fast setters for translationx/y
Romain Guy [Fri, 4 Feb 2011 02:08:03 +0000 (18:08 -0800)]
am
cb2c84fd: am
3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #
3420565" into honeycomb
* commit '
cb2c84fd81a0891071e8ed0237927ad785751850':
Refresh display lists when turning off layers rendering. Bug #
3420565
Xavier Ducrohet [Fri, 4 Feb 2011 02:07:36 +0000 (18:07 -0800)]
am
1ea9930e: am
5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb
* commit '
1ea9930e74a3b10186b7691060b6e6cf09f73b07':
LayoutLib: Fix some rendering issues
Evan Millar [Fri, 4 Feb 2011 02:07:29 +0000 (18:07 -0800)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Justin Ho [Fri, 4 Feb 2011 02:07:03 +0000 (18:07 -0800)]
am
da75a283: am
205bdd4f: Merge "Sounds cleanup" into honeycomb
* commit '
da75a28304a026634e6583735e525c13a2040239':
Sounds cleanup
satok [Fri, 4 Feb 2011 02:07:03 +0000 (18:07 -0800)]
Merge "Register ENABLED_INPUT_METHODS to SettingsObserver"
Jaikumar Ganesh [Fri, 4 Feb 2011 01:27:10 +0000 (17:27 -0800)]
Merge "Wait till SDP records are registered before sending intent."
Daniel Sandler [Fri, 4 Feb 2011 01:19:16 +0000 (17:19 -0800)]
am
63944f6c: am
2243cca4: Merge "Time to take down the Christmas lights." into honeycomb
* commit '
63944f6c38090e263d824d9c4a074d2baf13a21c':
Time to take down the Christmas lights.
Joe Malin [Fri, 4 Feb 2011 01:19:05 +0000 (17:19 -0800)]
am
64ee4ed4: am
70ff567a: Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb
* commit '
64ee4ed48de701ffa0096e8fb715a604821d6b5e':
DOC CHANGE: Fix bugs in Installing SDK topic
Eric Laurent [Fri, 4 Feb 2011 01:18:46 +0000 (17:18 -0800)]
Justin Ho [Fri, 4 Feb 2011 01:18:36 +0000 (17:18 -0800)]
am
7fbdc7f6: am
8138fc1f: Merge "Adding Iridium as a ringtone" into honeycomb
* commit '
7fbdc7f6ecfff38693e4ca337984b591a8560574':
Adding Iridium as a ringtone
Daniel Sandler [Fri, 4 Feb 2011 01:18:23 +0000 (17:18 -0800)]
am
62362af8: am
81034187: Merge "Move the low battery sound to the notification stream." into honeycomb
* commit '
62362af8f93a44147e27a43c56d3c8da22ae1864':
Move the low battery sound to the notification stream.
Dheeraj Sharma [Fri, 4 Feb 2011 01:18:13 +0000 (17:18 -0800)]
am
d13f987f: am
36b685ff: Merge "Fix for issue :
3419353 Crash during transition generation" into honeycomb
* commit '
d13f987f73df03b06c70c631452f6cafbdc254e1':
Fix for issue :
3419353 Crash during transition generation
Cary Clark [Fri, 4 Feb 2011 01:17:45 +0000 (17:17 -0800)]
am
859563eb: am
aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
* commit '
859563ebf7edbb6d556ef10bac7315fdc564e73a':
stop GL drawing thread before killing WebCore
Justin Ho [Fri, 4 Feb 2011 01:17:35 +0000 (17:17 -0800)]
am
7d75cd65: am
b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
* commit '
7d75cd65fa08e9457f6dacb5eb89664a09789dd9':
Changing Honeycomb default wallpaper
Romain Guy [Fri, 4 Feb 2011 01:17:21 +0000 (17:17 -0800)]
am
20bf23e5: am
ac14db72: Merge "Fast transform properties setters. Bug #
3413510" into honeycomb
* commit '
20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
Fast transform properties setters. Bug #
3413510
Daniel Sandler [Fri, 4 Feb 2011 01:16:54 +0000 (17:16 -0800)]
am
a2e82d4c: am
6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
* commit '
a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
Implement priority ordering in notifications.
Gil Dobjanschi [Fri, 4 Feb 2011 01:16:43 +0000 (17:16 -0800)]
am
3f9a851e: am
ed2c5133: Merge "Bug fix:
3419287 Deleted images and video clips invalidate the entire project" into honeycomb
* commit '
3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
Bug fix:
3419287 Deleted images and video clips invalidate the entire project
Joe Onorato [Fri, 4 Feb 2011 01:16:31 +0000 (17:16 -0800)]
am
020c021c: am
e9dea7b7: Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
* commit '
020c021c62f804ed08d89a3a38457a002184158e':
Add a bluetooth icon and data direction to the status bar.
Romain Guy [Fri, 4 Feb 2011 01:16:19 +0000 (17:16 -0800)]
am
109da7df: am
5bfd1aff: Merge "Allocate layers from the layers pool. Bug #
3413433" into honeycomb
* commit '
109da7dfd4c0766274b17467880ee673c731735c':
Allocate layers from the layers pool. Bug #
3413433
Justin Ho [Fri, 4 Feb 2011 01:15:33 +0000 (17:15 -0800)]
am
a29acdfb: am
1cee14f1: Merge "System bar tweaks" into honeycomb
* commit '
a29acdfb8a3c9812718ead057f77ef5dbd508682':
System bar tweaks
Justin Ho [Fri, 4 Feb 2011 01:15:21 +0000 (17:15 -0800)]
am
8e2c67ea: am
be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
* commit '
8e2c67ea26d38677802f3029472aa2393f47173d':
Adding new volume control dialog icons
Dianne Hackborn [Fri, 4 Feb 2011 01:15:04 +0000 (17:15 -0800)]
am
dd954212: am
a5861743: Merge "Fix issue #
3418265: Rotation animation on wallpaper is broken" into honeycomb
* commit '
dd95421291f590ec0b1d8e79b73264516e1da027':
Fix issue #
3418265: Rotation animation on wallpaper is broken
Jean-Michel Trivi [Fri, 4 Feb 2011 01:14:44 +0000 (17:14 -0800)]
am
d1488c58: am
17f88656: Fix audible selection sound is not played
* commit '
d1488c588d796ee0d44235b11510327144be977a':
Fix audible selection sound is not played
Scott Main [Fri, 4 Feb 2011 00:57:36 +0000 (16:57 -0800)]
Merge "docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:"
Andreas Huber [Fri, 4 Feb 2011 00:19:59 +0000 (16:19 -0800)]
Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"
Andreas Huber [Fri, 4 Feb 2011 00:19:30 +0000 (16:19 -0800)]
Merge "Make sure timestamps attached to encoded media are composition timestamps."
Jack Palevich [Thu, 3 Feb 2011 23:25:52 +0000 (15:25 -0800)]
Merge "Throw an exception when trying to upload a recycled bitmap."
Robert Greenwalt [Thu, 3 Feb 2011 22:16:45 +0000 (14:16 -0800)]
Merge "Stop using netmask in the framework."
Glenn Kasten [Thu, 3 Feb 2011 22:06:09 +0000 (14:06 -0800)]
Merge "Bug
1804058 FLAC extractor"
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:34:41 +0000 (13:34 -0800)]
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:32:08 +0000 (13:32 -0800)]
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:28:51 +0000 (13:28 -0800)]
am
4b8ad9ef: Merge from gingerbread
* commit '
4b8ad9effd95508e9966b8a3a355f0a948558ae2':
Fix delivery report error with PENDING status in SMS
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:17:49 +0000 (13:17 -0800)]
Merge from gingerbread
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
Robert Greenwalt [Thu, 3 Feb 2011 21:17:48 +0000 (13:17 -0800)]
Merge "Bind addr and prefixLength together in LinkAddress"
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:12:35 +0000 (13:12 -0800)]
am
baaaca1c: Merge
ee4c17ee from gingerbread
* commit '
baaaca1c6164eff17488a178859295a1d5be9171':
Fix delivery report error with PENDING status in SMS
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:03:36 +0000 (13:03 -0800)]
Merge
ee4c17ee from gingerbread
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:41:49 +0000 (12:41 -0800)]
Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
Justin Ho [Thu, 3 Feb 2011 20:38:26 +0000 (12:38 -0800)]
am
ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb
* commit '
ef36255f876aa1a61dcf5e879f4380887dda3854':
Revert "Sounds cleanup"
Justin Ho [Thu, 3 Feb 2011 20:35:51 +0000 (12:35 -0800)]
Merge "Revert "Sounds cleanup"" into honeycomb
Vasu Nori [Thu, 3 Feb 2011 20:24:59 +0000 (12:24 -0800)]
am
e1cbd0a8: Revert "Merge "bug:
3414192 new API to designate a download to be OTA update" into honeycomb"
* commit '
e1cbd0a85f09a54f8bf28545ac67455b7dcd2532':
Revert "Merge "bug:
3414192 new API to designate a download to be OTA update" into honeycomb"
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:17:47 +0000 (12:17 -0800)]
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
Michael Jurka [Thu, 3 Feb 2011 20:02:37 +0000 (12:02 -0800)]
am
8275c608: Merge "adding fast setters for translationx/y" into honeycomb
* commit '
8275c6087897e8fd614681d1cd12db62e6b9fcd5':
adding fast setters for translationx/y
Michael Jurka [Thu, 3 Feb 2011 20:00:37 +0000 (12:00 -0800)]
Merge "adding fast setters for translationx/y" into honeycomb
Romain Guy [Thu, 3 Feb 2011 19:46:47 +0000 (11:46 -0800)]
am
3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #
3420565" into honeycomb
* commit '
3b66e43e8c5671c646ccc6d52b0f2dec13898c91':
Refresh display lists when turning off layers rendering. Bug #
3420565
Shimeng (Simon) Wang [Thu, 3 Feb 2011 19:44:06 +0000 (11:44 -0800)]
Merge "Use more accurate height/width ratio."
Romain Guy [Thu, 3 Feb 2011 19:43:17 +0000 (11:43 -0800)]
Merge "Refresh display lists when turning off layers rendering. Bug #
3420565" into honeycomb
Xavier Ducrohet [Thu, 3 Feb 2011 19:23:39 +0000 (11:23 -0800)]
am
5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb
* commit '
5e76e0aea28042287553ffa21826f59f601a3d2b':
LayoutLib: Fix some rendering issues
Xavier Ducrohet [Thu, 3 Feb 2011 19:21:37 +0000 (11:21 -0800)]
Merge "LayoutLib: Fix some rendering issues" into honeycomb
Marco Nelissen [Thu, 3 Feb 2011 19:06:07 +0000 (11:06 -0800)]
Merge "Add a convenience method for getting the media provider version."
Kenny Root [Thu, 3 Feb 2011 19:04:28 +0000 (11:04 -0800)]
Merge "Remove defunct secure FS work"
Justin Ho [Thu, 3 Feb 2011 18:49:43 +0000 (10:49 -0800)]
am
205bdd4f: Merge "Sounds cleanup" into honeycomb
* commit '
205bdd4f8951d4af9cfaeb8fb4ad9d0f1cad1afc':
Sounds cleanup
Justin Ho [Thu, 3 Feb 2011 18:47:22 +0000 (10:47 -0800)]
Merge "Sounds cleanup" into honeycomb
Daniel Sandler [Thu, 3 Feb 2011 18:36:02 +0000 (10:36 -0800)]
am
2243cca4: Merge "Time to take down the Christmas lights." into honeycomb
* commit '
2243cca40c5f74cf89fe9bccce6e35af1acedb0c':
Time to take down the Christmas lights.
Daniel Sandler [Thu, 3 Feb 2011 18:33:50 +0000 (10:33 -0800)]
Merge "Time to take down the Christmas lights." into honeycomb
Joe Malin [Thu, 3 Feb 2011 18:30:38 +0000 (10:30 -0800)]
am
70ff567a: Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb
* commit '
70ff567a2722789ac5196a92e615dd39c29b5964':
DOC CHANGE: Fix bugs in Installing SDK topic
Eric Laurent [Thu, 3 Feb 2011 18:28:24 +0000 (10:28 -0800)]
am
9c0a1003: Merge "Fix issue
3371080" into honeycomb
* commit '
9c0a1003bd676121cf9b1c942ecebd5b486290d5':
Fix issue
3371080
Joe Malin [Thu, 3 Feb 2011 18:27:22 +0000 (10:27 -0800)]
Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb
Eric Laurent [Thu, 3 Feb 2011 18:26:05 +0000 (10:26 -0800)]
Merge "Fix issue
3371080" into honeycomb
Justin Ho [Thu, 3 Feb 2011 18:23:51 +0000 (10:23 -0800)]
am
8138fc1f: Merge "Adding Iridium as a ringtone" into honeycomb
* commit '
8138fc1ff3c541ee040b55f07d06b2e2974247bf':
Adding Iridium as a ringtone
Justin Ho [Thu, 3 Feb 2011 18:21:17 +0000 (10:21 -0800)]
Merge "Adding Iridium as a ringtone" into honeycomb
Mike Lockwood [Thu, 3 Feb 2011 17:51:06 +0000 (09:51 -0800)]
Merge changes I80558c62,I6587f580
* changes:
UsbService: Blacklist HID boot subclass devices (keyboards and mice)
UsbService: Add support for blacklisting certain USB busses
Daniel Sandler [Thu, 3 Feb 2011 17:50:27 +0000 (09:50 -0800)]
am
81034187: Merge "Move the low battery sound to the notification stream." into honeycomb
* commit '
81034187a34c7c6432e62d2dc2332e987ce4f5db':
Move the low battery sound to the notification stream.
Daniel Sandler [Thu, 3 Feb 2011 17:47:45 +0000 (09:47 -0800)]
Merge "Move the low battery sound to the notification stream." into honeycomb
Dheeraj Sharma [Thu, 3 Feb 2011 17:38:43 +0000 (09:38 -0800)]
am
36b685ff: Merge "Fix for issue :
3419353 Crash during transition generation" into honeycomb
* commit '
36b685ffb0e3c1848bc8085757da3e673d19028a':
Fix for issue :
3419353 Crash during transition generation
Dheeraj Sharma [Thu, 3 Feb 2011 17:36:02 +0000 (09:36 -0800)]
Merge "Fix for issue :
3419353 Crash during transition generation" into honeycomb
Cary Clark [Thu, 3 Feb 2011 16:52:21 +0000 (08:52 -0800)]
am
aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
* commit '
aa7dc92838f4e3d423b2a738f54de9b83f83794b':
stop GL drawing thread before killing WebCore
Cary Clark [Thu, 3 Feb 2011 16:48:24 +0000 (08:48 -0800)]
Merge "stop GL drawing thread before killing WebCore" into honeycomb
Justin Ho [Thu, 3 Feb 2011 15:31:28 +0000 (07:31 -0800)]
am
b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
* commit '
b732e6d20571e9098b02f4d49f0e4359c232eaa0':
Changing Honeycomb default wallpaper
Justin Ho [Thu, 3 Feb 2011 15:25:18 +0000 (07:25 -0800)]
Merge "Changing Honeycomb default wallpaper" into honeycomb
Romain Guy [Thu, 3 Feb 2011 09:37:29 +0000 (01:37 -0800)]
am
ac14db72: Merge "Fast transform properties setters. Bug #
3413510" into honeycomb
* commit '
ac14db72ca55110326f4ceb9ac34fddd360036f4':
Fast transform properties setters. Bug #
3413510
Romain Guy [Thu, 3 Feb 2011 09:11:39 +0000 (01:11 -0800)]
Merge "Fast transform properties setters. Bug #
3413510" into honeycomb
Daniel Sandler [Thu, 3 Feb 2011 06:41:25 +0000 (22:41 -0800)]
am
6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
* commit '
6f922cbe823c19234bc15eea9ac709f399e9a63c':
Implement priority ordering in notifications.
Daniel Sandler [Thu, 3 Feb 2011 06:39:25 +0000 (22:39 -0800)]
Merge "Implement priority ordering in notifications." into honeycomb
Gil Dobjanschi [Thu, 3 Feb 2011 06:06:33 +0000 (22:06 -0800)]
am
ed2c5133: Merge "Bug fix:
3419287 Deleted images and video clips invalidate the entire project" into honeycomb
* commit '
ed2c513337ae7581ef73b88424da91ef2d862a78':
Bug fix:
3419287 Deleted images and video clips invalidate the entire project
Gil Dobjanschi [Thu, 3 Feb 2011 06:04:38 +0000 (22:04 -0800)]
Merge "Bug fix:
3419287 Deleted images and video clips invalidate the entire project" into honeycomb
Joe Onorato [Thu, 3 Feb 2011 05:24:47 +0000 (21:24 -0800)]
am
e9dea7b7: Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
* commit '
e9dea7b735fb0fdb1956d96a6e78b1c5cd666316':
Add a bluetooth icon and data direction to the status bar.
Joe Onorato [Thu, 3 Feb 2011 05:22:49 +0000 (21:22 -0800)]
Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
Romain Guy [Thu, 3 Feb 2011 05:07:17 +0000 (21:07 -0800)]
am
5bfd1aff: Merge "Allocate layers from the layers pool. Bug #
3413433" into honeycomb
* commit '
5bfd1afffe361958682bcb899b763ce35ec00c3a':
Allocate layers from the layers pool. Bug #
3413433
Romain Guy [Thu, 3 Feb 2011 05:05:35 +0000 (21:05 -0800)]
Merge "Allocate layers from the layers pool. Bug #
3413433" into honeycomb
Justin Ho [Thu, 3 Feb 2011 02:50:02 +0000 (18:50 -0800)]
am
1cee14f1: Merge "System bar tweaks" into honeycomb
* commit '
1cee14f154aadabcd9990bd73a197fbd744660ad':
System bar tweaks
Justin Ho [Thu, 3 Feb 2011 02:47:53 +0000 (18:47 -0800)]
Merge "System bar tweaks" into honeycomb
Justin Ho [Thu, 3 Feb 2011 02:47:50 +0000 (18:47 -0800)]
am
be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
* commit '
be36f9a3b049157b29d3fbe4f685ed8a3021344e':
Adding new volume control dialog icons
Justin Ho [Thu, 3 Feb 2011 02:45:27 +0000 (18:45 -0800)]
Merge "Adding new volume control dialog icons" into honeycomb
Dianne Hackborn [Thu, 3 Feb 2011 02:44:36 +0000 (18:44 -0800)]
am
a5861743: Merge "Fix issue #
3418265: Rotation animation on wallpaper is broken" into honeycomb
* commit '
a58617430d699d26948357f204f09a6ca0b837b8':
Fix issue #
3418265: Rotation animation on wallpaper is broken
Dianne Hackborn [Thu, 3 Feb 2011 02:42:45 +0000 (18:42 -0800)]
Merge "Fix issue #
3418265: Rotation animation on wallpaper is broken" into honeycomb
Jean-Michel Trivi [Thu, 3 Feb 2011 02:22:18 +0000 (18:22 -0800)]
am
17f88656: Fix audible selection sound is not played
* commit '
17f886563c7c2cbd28c3aeaf8b68d37c8e5105c0':
Fix audible selection sound is not played
Scott Main [Thu, 3 Feb 2011 02:14:03 +0000 (18:14 -0800)]
am
28f69ee4: am
2e5fea59: am
ca69a634: fix broken links, update the dev guide intro, and update sitemap file
* commit '
28f69ee47ed80fe7c4792e59093116a97a1ea095':
fix broken links, update the dev guide intro, and update sitemap file
Scott Main [Thu, 3 Feb 2011 02:11:55 +0000 (18:11 -0800)]
am
2e5fea59: am
ca69a634: fix broken links, update the dev guide intro, and update sitemap file
* commit '
2e5fea59c29762227ba31b144bedf91f1384c968':
fix broken links, update the dev guide intro, and update sitemap file