OSDN Git Service
The Android Open Source Project [Sat, 3 Mar 2012 00:43:42 +0000 (16:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
Scott Main [Sat, 3 Mar 2012 00:40:21 +0000 (16:40 -0800)]
am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
The Android Automerger [Fri, 2 Mar 2012 19:51:23 +0000 (11:51 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Ly [Fri, 2 Mar 2012 17:06:44 +0000 (09:06 -0800)]
am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
e5e11fd666d242b099466017c6d9bd23e6d2896d':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:04:16 +0000 (09:04 -0800)]
Merge "docs: fixing bug
5942573" into ics-mr1
Dianne Hackborn [Fri, 2 Mar 2012 16:33:21 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:30:36 +0000 (08:30 -0800)]
Merge "Make ResolverActivity update dynamically." into ics-mr1
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:07:43 +0000 (17:07 -0800)]
am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
3e70127021f5d5940edfdefd7e33fd65d4ec0449':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:05:43 +0000 (17:05 -0800)]
Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
Robert Ly [Thu, 1 Mar 2012 22:11:05 +0000 (14:11 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:08:40 +0000 (14:08 -0800)]
Merge "fix bug
5942522" into ics-mr1
Robert Ly [Thu, 1 Mar 2012 20:44:35 +0000 (12:44 -0800)]
am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
docs: fix bug
5878445
Robert Ly [Thu, 1 Mar 2012 20:42:24 +0000 (12:42 -0800)]
Merge "docs: fix bug
5878445" into ics-mr1
The Android Open Source Project [Thu, 1 Mar 2012 18:40:12 +0000 (10:40 -0800)]
Reconcile with ics-mr1-release
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:00:00 +0000 (19:00 -0800)]
am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
eb4f3256b77fe7fd783297a550a64ea441c41169':
Set the video encoding bit rate for the media recorder stress test.
Eric Fischer [Wed, 29 Feb 2012 21:26:08 +0000 (13:26 -0800)]
am
fb393f8b: Mark configuration strings as not translatable.
* commit '
fb393f8bd79602c933dc829bd36070dd78be2872':
Mark configuration strings as not translatable.
Roman Nurik [Wed, 29 Feb 2012 20:43:29 +0000 (12:43 -0800)]
am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
docs: Android Design downloads section, linkable H2s.
Robert Ly [Tue, 28 Feb 2012 23:39:55 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:37:21 +0000 (15:37 -0800)]
Merge "fix bug
5911175" into ics-mr1
The Android Automerger [Tue, 28 Feb 2012 23:14:55 +0000 (15:14 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Tue, 28 Feb 2012 23:03:28 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:01:04 +0000 (15:01 -0800)]
Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
felipeal [Tue, 28 Feb 2012 22:05:23 +0000 (14:05 -0800)]
am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
Jason Noguchi [Tue, 28 Feb 2012 19:49:30 +0000 (11:49 -0800)]
am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:47:46 +0000 (11:47 -0800)]
Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
Svetoslav Ganov [Tue, 28 Feb 2012 18:35:18 +0000 (10:35 -0800)]
am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
The Android Automerger [Tue, 28 Feb 2012 00:10:06 +0000 (16:10 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 27 Feb 2012 22:42:58 +0000 (14:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Ly [Mon, 27 Feb 2012 16:42:19 +0000 (08:42 -0800)]
am
85cb9dec: Merge "docs: fix bug
5990526" into ics-mr1
* commit '
85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug
5990526
Robert Ly [Mon, 27 Feb 2012 16:40:54 +0000 (08:40 -0800)]
Merge "docs: fix bug
5990526" into ics-mr1
Xavier Ducrohet [Sat, 25 Feb 2012 03:32:32 +0000 (19:32 -0800)]
am
44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '
44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
Dianne Hackborn [Sat, 25 Feb 2012 00:25:30 +0000 (16:25 -0800)]
am
5786f5cf: Merge "Fix build." into ics-mr1
* commit '
5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
Dianne Hackborn [Sat, 25 Feb 2012 00:23:07 +0000 (16:23 -0800)]
Merge "Fix build." into ics-mr1
Dianne Hackborn [Fri, 24 Feb 2012 23:38:03 +0000 (15:38 -0800)]
am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
133dc2d7aecc68990c363c861716b134910a4ced':
Fix issue #
6048808: sometimes auto-correct is inactive
Dianne Hackborn [Fri, 24 Feb 2012 23:36:33 +0000 (15:36 -0800)]
Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
The Android Open Source Project [Fri, 24 Feb 2012 22:05:51 +0000 (14:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
Xavier Ducrohet [Fri, 24 Feb 2012 02:41:48 +0000 (18:41 -0800)]
am
816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '
816b873df1ab98d0e79913cf589b7b1fbaf14e85':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:41:43 +0000 (18:41 -0800)]
am
eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Andrew Flynn [Fri, 24 Feb 2012 00:09:36 +0000 (16:09 -0800)]
Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop
Joe Fernandez [Thu, 23 Feb 2012 22:24:53 +0000 (14:24 -0800)]
am
566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
* commit '
566328a2a5fcd8c40fc67d8974d6df0df48b0056':
docs: NDK overview, remove x86 instruction set mention (b/
6044027)
Joe Fernandez [Thu, 23 Feb 2012 22:22:41 +0000 (14:22 -0800)]
Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
The Android Automerger [Thu, 23 Feb 2012 18:45:15 +0000 (10:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Michael Jurka [Thu, 23 Feb 2012 16:07:51 +0000 (08:07 -0800)]
am
bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '
bf378fd7d7a91085685fe9e5528b84c485041c77':
Don't allow screen invalidations to go outside bounds of screen
Scott Main [Thu, 23 Feb 2012 00:23:03 +0000 (16:23 -0800)]
am
68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '
68d97aa2c1ff16f327491fed5afb8b318f034a01':
docs: fix broken link
Scott Main [Thu, 23 Feb 2012 00:20:49 +0000 (16:20 -0800)]
Merge "docs: fix broken link" into ics-mr1
Xavier Ducrohet [Wed, 22 Feb 2012 18:49:35 +0000 (10:49 -0800)]
am
503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '
503247f213ef2894324a22e7608101e90a7fe8fb':
Make sure resource references are resolved.
Xavier Ducrohet [Wed, 22 Feb 2012 18:47:32 +0000 (10:47 -0800)]
Merge "Make sure resource references are resolved." into ics-mr1
Rich Hyndman [Wed, 22 Feb 2012 11:43:35 +0000 (03:43 -0800)]
am
942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
* commit '
942b823ce4b2e0e11d395dffb2d340de01811612':
docs: Added Lint into Android Training and removed Layoutopt.
Rich Hyndman [Wed, 22 Feb 2012 11:41:05 +0000 (03:41 -0800)]
Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:36:33 +0000 (15:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id8505107b41a8b89c123c16d33f609480a555632
The Android Automerger [Tue, 21 Feb 2012 23:27:33 +0000 (15:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:13:30 +0000 (15:13 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic0dc3fd4a476aecd8854c8a919ba1e096cc938f0
Dianne Hackborn [Tue, 21 Feb 2012 22:57:55 +0000 (14:57 -0800)]
am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
Fix issue #
6037252: Screen shifts after all apps are upgraded
The Android Automerger [Sat, 18 Feb 2012 00:38:41 +0000 (16:38 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:55:44 +0000 (15:55 -0800)]
am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
2d559b5311be1cd909e5a445afe75a840688b822':
fix NPE in race condition.
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:53:50 +0000 (15:53 -0800)]
Merge "fix NPE in race condition." into ics-mr1
Adam Powell [Fri, 17 Feb 2012 23:25:18 +0000 (15:25 -0800)]
am
482ae5f2: Bug
6021294 - Contextual action bar animation tweaks
* commit '
482ae5f2388a07d60d7f3b54432120172af25eee':
Bug
6021294 - Contextual action bar animation tweaks
The Android Open Source Project [Fri, 17 Feb 2012 17:02:50 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6
Marc Blank [Fri, 17 Feb 2012 00:54:23 +0000 (16:54 -0800)]
am
094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit '
094bf51ec0911057263a27db4d79db4eface2d63':
Use ' for apostrophe in HTML encoding DO NOT MERGE
The Android Automerger [Fri, 17 Feb 2012 00:26:06 +0000 (16:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Thu, 16 Feb 2012 22:43:43 +0000 (14:43 -0800)]
am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
06a591cdd6d90600db006906d5d1524d156d6529':
Fix last change -- don't call startInputInner() with lock held.
The Android Open Source Project [Thu, 16 Feb 2012 18:10:13 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
The Android Automerger [Thu, 16 Feb 2012 17:40:11 +0000 (09:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:28:12 +0000 (09:28 -0800)]
am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
e8e0527aa699c7db999b659b044d16cea6c67901':
Update WiMAX notification icons Bug:
5724605
Justin Ho [Thu, 16 Feb 2012 17:27:05 +0000 (09:27 -0800)]
Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:25:03 +0000 (09:25 -0800)]
am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:23:01 +0000 (09:23 -0800)]
Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
Scott Main [Thu, 16 Feb 2012 01:33:15 +0000 (17:33 -0800)]
am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also;
* commit '
2a1d19174e32bb6056086ec603948cd476a2ea67':
docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
Scott Main [Thu, 16 Feb 2012 01:31:54 +0000 (17:31 -0800)]
Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1
Scott Main [Wed, 15 Feb 2012 21:26:27 +0000 (13:26 -0800)]
am
26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '
26703326784a6de45830236bd0a97345f93448d4':
docs: Google+ badge now sizes properly; remove reposition hack
The Android Automerger [Tue, 14 Feb 2012 22:15:44 +0000 (14:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:39:55 +0000 (13:39 -0800)]
am
c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
* commit '
c8711ca7eb962072ccd6175be3cfa861195ba6cd':
Stop using shared DUN APN when tethering stops.
Robert Greenwalt [Tue, 14 Feb 2012 21:39:53 +0000 (13:39 -0800)]
am
fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit '
fc19160a6a464eb71e50794fc1aa1e99c4173e31':
Add a config to set Dun capabilities.
Robert Greenwalt [Tue, 14 Feb 2012 21:38:15 +0000 (13:38 -0800)]
Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:37:44 +0000 (13:37 -0800)]
Merge "Add a config to set Dun capabilities." into ics-mr1
Justin Ho [Tue, 14 Feb 2012 21:31:28 +0000 (13:31 -0800)]
am
c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug:
5724605" into ics-mr1
* commit '
c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug:
5724605
Justin Ho [Tue, 14 Feb 2012 21:29:08 +0000 (13:29 -0800)]
Merge "Update 4G WiMAX assets for notification area as well Bug:
5724605" into ics-mr1
Joe Fernandez [Tue, 14 Feb 2012 20:37:43 +0000 (12:37 -0800)]
am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
Mike Lockwood [Tue, 14 Feb 2012 20:37:40 +0000 (12:37 -0800)]
am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
John Wang [Tue, 14 Feb 2012 20:37:38 +0000 (12:37 -0800)]
am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
Joe Fernandez [Tue, 14 Feb 2012 20:05:25 +0000 (12:05 -0800)]
Merge "docs: Android NDK r7b Release Notes" into ics-mr1
Mike Lockwood [Tue, 14 Feb 2012 19:30:05 +0000 (11:30 -0800)]
Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1
John Wang [Tue, 14 Feb 2012 18:09:26 +0000 (10:09 -0800)]
Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:22:44 +0000 (14:22 -0800)]
Merge "DO NOT MERGE" into ics-scoop
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:42:45 +0000 (13:42 -0800)]
am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
extending timeout to stabilize tests
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:41:37 +0000 (13:41 -0800)]
Merge "extending timeout to stabilize tests" into ics-mr1
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Wink Saville [Fri, 10 Feb 2012 23:14:40 +0000 (15:14 -0800)]
am
197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '
197fe26940022be75384f4038dd789f446d33122':
Add OEM specific USB mode enumeration based on ro.bootmode property
Wink Saville [Fri, 10 Feb 2012 23:12:19 +0000 (15:12 -0800)]
Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
Eric Fischer [Fri, 10 Feb 2012 21:11:46 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:10:39 +0000 (10:10 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
Scott Main [Fri, 10 Feb 2012 00:01:38 +0000 (16:01 -0800)]
am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
d9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug
5125642
Joe Fernandez [Thu, 9 Feb 2012 21:46:55 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
Scott Main [Thu, 9 Feb 2012 20:48:18 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Scott Main [Wed, 8 Feb 2012 05:47:38 +0000 (21:47 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
The Android Open Source Project [Tue, 7 Feb 2012 18:18:32 +0000 (10:18 -0800)]
Reconcile with ics-mr1-release
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
John Wang [Tue, 7 Feb 2012 01:03:15 +0000 (17:03 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
OSDN Git Service
