Scott Main
b3959077b7
am c0632572: am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0
...
* commit 'c06325727f6f784f873e45cdbc8e4ddcc5de9aab':
docs: fix platform highlights
2011-10-18 17:53:35 -07:00
Jim Miller
0262b4de1b
am 90e4ad00: am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0
...
* commit '90e4ad00a785e99a84214d363bdf8d86d5e2799b':
Fix 5288804: Make music trasports in lockscreen more closely match design
2011-10-18 17:53:33 -07:00
Scott Main
c06325727f
am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0
...
* commit 'f49ee00f9e1975887142695e0040cd5dc410b9db':
docs: fix platform highlights
2011-10-18 17:51:42 -07:00
Jim Miller
90e4ad00a7
am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0
...
* commit '06398768ec048cf05717ee44b81cb357fdc896dd':
Fix 5288804: Make music trasports in lockscreen more closely match design
2011-10-18 17:51:41 -07:00
Scott Main
f49ee00f9e
Merge "docs: fix platform highlights" into ics-mr0
2011-10-18 17:49:32 -07:00
Jim Miller
06398768ec
Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0
2011-10-18 17:49:28 -07:00
Jason Sams
fa5924c59d
am 2e221448: Merge "Add mandelbrot to compute perf"
...
* commit '2e22144891dac8bc381a9e17bc15a0b7c52b8c30':
Add mandelbrot to compute perf
2011-10-18 17:46:28 -07:00
Jason Sams
2e22144891
Merge "Add mandelbrot to compute perf"
2011-10-18 17:44:33 -07:00
Robert Ly
a94c7bdcf8
docs: fix platform highlights
...
Change-Id: I876a78661f2198eb8992f0183736de454cd2c4bc
2011-10-18 17:44:02 -07:00
Scott Main
8f98a68317
am 6629a105: am 4de8cb50: Merge "docs: update homepage for ICS announcement" into ics-mr0
...
* commit '6629a1054a559a34c8de964ea39459dd9856b97c':
docs: update homepage for ICS announcement
2011-10-18 17:38:37 -07:00
Scott Main
6629a1054a
am 4de8cb50: Merge "docs: update homepage for ICS announcement" into ics-mr0
...
* commit '4de8cb509bfefb920b6696209f659810dfd06e6e':
docs: update homepage for ICS announcement
2011-10-18 17:36:15 -07:00
Scott Main
4de8cb509b
Merge "docs: update homepage for ICS announcement" into ics-mr0
2011-10-18 17:34:23 -07:00
Scott Main
4c84ee2785
docs: update homepage for ICS announcement
...
Change-Id: Ida9f245910075df26c4fedf9a61c657079e5cc41
2011-10-18 17:32:36 -07:00
Jason Sams
02bd36369b
Add mandelbrot to compute perf
...
Change-Id: I8217134a703fcd72f6c9a3bdd4e2a6b389ea0fd3
2011-10-18 17:31:02 -07:00
Robert Ly
f708f75474
am abada5d0: am 8f8e14c1: Merge "docs: change compatibility package to support package and update rel notes for r4" into ics-mr0
...
* commit 'abada5d02db2a2b433b0a7d3b026a07766ce0b4c':
docs: change compatibility package to support package and update rel notes for r4
2011-10-18 17:28:22 -07:00
Robert Ly
abada5d02d
am 8f8e14c1: Merge "docs: change compatibility package to support package and update rel notes for r4" into ics-mr0
...
* commit '8f8e14c11c9680f5c62245f3fcc3774f8d23c05a':
docs: change compatibility package to support package and update rel notes for r4
2011-10-18 17:26:06 -07:00
Robert Ly
065ac42438
am 6b8c7f87: am 93f97f53: Merge "docs: rs link fixes" into ics-mr0
...
* commit '6b8c7f87b051c5a4edb80bf16988b622b9940b5e':
docs: rs link fixes
2011-10-18 17:25:17 -07:00
Robert Ly
8f8e14c11c
Merge "docs: change compatibility package to support package and update rel notes for r4" into ics-mr0
2011-10-18 17:24:02 -07:00
Scott Main
09868f8577
am 3a9cf549: am 90889821: Merge "docs: fix misc broken links" into ics-mr0
...
* commit '3a9cf54931a4907a3fe170640233a79e9140edd2':
docs: fix misc broken links
2011-10-18 17:23:23 -07:00
Robert Ly
6b8c7f87b0
am 93f97f53: Merge "docs: rs link fixes" into ics-mr0
...
* commit '93f97f53df964ec11628bf58621a1594d24e8cd7':
docs: rs link fixes
2011-10-18 17:23:11 -07:00
Scott Main
3a9cf54931
am 90889821: Merge "docs: fix misc broken links" into ics-mr0
...
* commit '90889821f1a5b1db3da8341156e9da9d2fc8f484':
docs: fix misc broken links
2011-10-18 17:21:12 -07:00
Robert Ly
93f97f53df
Merge "docs: rs link fixes" into ics-mr0
2011-10-18 17:20:57 -07:00
Scott Main
90889821f1
Merge "docs: fix misc broken links" into ics-mr0
2011-10-18 17:19:14 -07:00
Robert Ly
849759380e
docs: rs link fixes
...
Change-Id: I5c8e16a914b314522da3ba6f1a75c36a831b4668
2011-10-18 17:16:17 -07:00
Scott Main
19aad293c0
docs: fix misc broken links
...
Change-Id: Ie0406bce6c4f1fa03b16bba76ed82ac75bfbb5f7
2011-10-18 16:57:32 -07:00
Robert Ly
8db858f1dd
docs: change compatibility package to support package and update rel notes for r4
...
Change-Id: I57496090c207fc347adc144a66346b44479570ee
2011-10-18 16:52:32 -07:00
John Reck
282f0c3fbf
am ee4ebb10: am 49dfd814: Merge "Find on page asset update" into ics-mr0
...
* commit 'ee4ebb10818131d2df363f18d4ea521fcca998b2':
Find on page asset update
2011-10-18 16:41:29 -07:00
John Reck
ee4ebb1081
am 49dfd814: Merge "Find on page asset update" into ics-mr0
...
* commit '49dfd814acef0c4b3bc9e408969d5ffa99883664':
Find on page asset update
2011-10-18 16:39:39 -07:00
John Reck
49dfd814ac
Merge "Find on page asset update" into ics-mr0
2011-10-18 16:37:03 -07:00
Eric Fischer
c438a49a21
am af50cd94: Merge "Import revised translations."
...
* commit 'af50cd94fe6bb51231c83cc2344f381a194d1b5a':
Import revised translations.
2011-10-18 16:29:26 -07:00
Eric Fischer
af50cd94fe
Merge "Import revised translations."
2011-10-18 16:27:32 -07:00
Christopher Tate
3b4f8c1396
am edeb0d27: Merge "Fix full backup of shared storage"
...
* commit 'edeb0d27baf2b8334dcdaf8ddb9f8e380ca85332':
Fix full backup of shared storage
2011-10-18 16:22:06 -07:00
Christopher Tate
edeb0d27ba
Merge "Fix full backup of shared storage"
2011-10-18 16:19:37 -07:00
Scott Main
c8810ed0ea
am 68625766: am a25a9975: Merge "docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button" into ics-mr0
...
* commit '686257667a5afa6c9335ba32d1f10217fa7a1cfe':
docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button
2011-10-18 16:00:41 -07:00
Scott Main
686257667a
am a25a9975: Merge "docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button" into ics-mr0
...
* commit 'a25a99759774206ec8712af95bba9aec47034e0e':
docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button
2011-10-18 15:58:21 -07:00
Scott Main
c5ad2bd645
am 73606c2f: am 35f78f30: Merge "docs: add package summary for spell checker services" into ics-mr0
...
* commit '73606c2f601d10476a26047b8f58bea100e8e521':
docs: add package summary for spell checker services
2011-10-18 15:57:57 -07:00
Scott Main
73606c2f60
am 35f78f30: Merge "docs: add package summary for spell checker services" into ics-mr0
...
* commit '35f78f30f39832ca8f6cd21140d501c53a2aa826':
docs: add package summary for spell checker services
2011-10-18 15:55:33 -07:00
Scott Main
a25a997597
Merge "docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button" into ics-mr0
2011-10-18 15:55:25 -07:00
Scott Main
35f78f30f3
Merge "docs: add package summary for spell checker services" into ics-mr0
2011-10-18 15:54:04 -07:00
Scott Main
423aca1325
docs: more ics overview changes... reorg a few sections, revise intro paragraph
...
also update API levels doc with ICS version
add info about system themes and using an options menu button
Change-Id: I8adb2486fcceb91856fb1cbca4900bdb10ea6fe7
2011-10-18 15:53:35 -07:00
John Reck
5cbc7ba7ad
Find on page asset update
...
Bug: 5452478
Change-Id: Iea11cbc7efda03887c5205fb6677f3f88c313737
2011-10-18 15:51:55 -07:00
Brian Colonna
8335bc5f0b
am 2c4c6dfa: am 2720cfae: Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0
...
* commit '2c4c6dfa8dfc48deca1f794cf586e1d9a47b26f8':
Fix 5433466 - FU out of position during orientation change
2011-10-18 15:51:46 -07:00
Brian Colonna
2c4c6dfa8d
am 2720cfae: Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0
...
* commit '2720cfae624770674122640f2d4a3f55702d80ff':
Fix 5433466 - FU out of position during orientation change
2011-10-18 15:49:12 -07:00
Christopher Tate
fb2ea43112
Fix full backup of shared storage
...
The manifest said android:allowBackup="false" for vestigal reasons;
originally, the incremental and full backup agents were separate, and
it was not possible to opt out of full backup. When that got fixed,
unfortunately this one manifest was not corrected to the new regime.
Bug 5411789
Change-Id: Iafc8f1fdefc312dff59454485604b6c5c400f469
2011-10-18 15:47:59 -07:00
Winson Chung
ea5b5ffdf6
am 9b29987e: (-s ours) am ee5aa0e8: (-s ours) Merge "DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)" into ics-mr0
...
* commit '9b29987efcc70ca22951e6d557e48e22a88ce1d6':
DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)
2011-10-18 15:47:33 -07:00
Winson Chung
da9c9d5756
am 74cf7204: am 9beac371: Merge "Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)" into ics-mr0
...
* commit '74cf7204644f4a30602a223bb5f687abaa2c4a0f':
Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)
2011-10-18 15:47:30 -07:00
Brian Colonna
2720cfae62
Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0
2011-10-18 15:46:54 -07:00
Winson Chung
9b29987efc
am ee5aa0e8: (-s ours) Merge "DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)" into ics-mr0
...
* commit 'ee5aa0e867657f06b63f1582f23af1cc1799f19a':
DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)
2011-10-18 15:45:55 -07:00
Winson Chung
74cf720464
am 9beac371: Merge "Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)" into ics-mr0
...
* commit '9beac371dd3f3977c3e0ab471a776a5191590f63':
Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)
2011-10-18 15:45:53 -07:00
Winson Chung
ee5aa0e867
Merge "DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)" into ics-mr0
2011-10-18 15:44:04 -07:00