Commit Graph

7724 Commits

Author SHA1 Message Date
Scott Main
bcb1457898 am 769a02fd: am 5be15a0f: Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1
* commit '769a02fd81fdf7e2a92c8282fa5eee05a4273b63':
  docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704
2012-02-01 00:15:54 -08:00
Scott Main
769a02fd81 am 5be15a0f: Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1
* commit '5be15a0f13ce559ca6339f0d2cf3dca9f3001dc1':
  docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704
2012-01-31 14:26:19 -08:00
Scott Main
5be15a0f13 Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1 2012-01-31 14:24:54 -08:00
Scott Main
35e8c99869 docs: update TOS and PP links to point to unified policy/tems
also add a link to the b.android.com issue for reporting doc issues
and open footer links in a new window
issue: 5931704

Change-Id: Icd6e9b7fb742b05a3c2064b6f2f7767b5b7ed1d8
2012-01-31 11:20:24 -08:00
Scott Main
324b3a8bc5 am a20557fb: am 2032e319: docs: add schema.org sitenavigation scope for sid-navs
* commit 'a20557fb4ddb3f008caf7bdb920c9ab90945ef7f':
  docs: add schema.org sitenavigation scope for sid-navs
2012-01-30 17:24:54 -08:00
Scott Main
a20557fb4d am 2032e319: docs: add schema.org sitenavigation scope for sid-navs
* commit '2032e31979d0708120b4785bad6ee19ee1c4dc0c':
  docs: add schema.org sitenavigation scope for sid-navs
2012-01-30 17:23:02 -08:00
Scott Main
2032e31979 docs: add schema.org sitenavigation scope for sid-navs
Change-Id: I0952195223f93bda67af0b951c3a061fe92948ce
2012-01-30 16:26:41 -08:00
Scott Main
068dcde2e7 am 3728f56b: am 939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
* commit '3728f56bc62f35d576b12180f5bbf33d0c83f00d':
  docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
2012-01-30 16:17:13 -08:00
Scott Main
3728f56bc6 am 939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
* commit '939c3f72280fadbdc192b6bedd97555c2fcd4ef3':
  docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
2012-01-30 16:15:28 -08:00
Wink Saville
8d5610cd1b Merge "Increase java heap size." 2012-01-30 15:42:28 -08:00
Wink Saville
29b3afaf79 Increase java heap size.
I got an Out of memory while compiling, Andreas Huber suggested that
increasing the heap size, which worked.

Change-Id: Id8293ef100ef814b0fe13aa6e1b891a36a2ee853
2012-01-30 15:30:10 -08:00
Scott Main
00bdc01845 am 1d5b7c54: am 3652a113: docs: add support for meta descriptions in the <head>
* commit '1d5b7c5490d256bdaa516db4aaed584e9f0d1469':
  docs: add support for meta descriptions in the <head>
2012-01-30 15:28:24 -08:00
Scott Main
939c3f7228 docs: modify css to support sidenav headings with span, instead of h2
because I suspect the h2 is sending mixed signals to search engines for result snippets

Change-Id: I80f13774f25439efebcade1b9db41c005018d2aa
2012-01-30 15:17:45 -08:00
Scott Main
1d5b7c5490 am 3652a113: docs: add support for meta descriptions in the <head>
* commit '3652a113d1a099ece283e3154188f4a42958c298':
  docs: add support for meta descriptions in the <head>
2012-01-30 15:14:44 -08:00
James Dong
98387a2485 Merge "Added libstagefright_soft_aacenc to all builds of all products" 2012-01-30 14:42:27 -08:00
The Android Open Source Project
ea6eb74a69 am 4e29e398: Reconcile with ics-mr1-release
* commit '4e29e3986710c4078faaac9ae662d8f79d74d51f':
  IMM30
  IMM26
  IMM25
  IMM24
  IMM20C
2012-01-30 13:38:36 -08:00
The Android Open Source Project
4e29e39867 Reconcile with ics-mr1-release
Change-Id: Iae7c919c7e0b4dcbf024514431421cdfd225a507
2012-01-30 13:36:23 -08:00
The Android Automerger
5583c80be1 IMM30 2012-01-30 13:26:51 -08:00
The Android Automerger
1e0956a4c2 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:21:49 -08:00
Scott Main
3652a113d1 docs: add support for meta descriptions in the <head>
Change-Id: I7ff7a5083a75dde718b4701623e029c225289617
2012-01-30 13:03:37 -08:00
Ying Wang
2addd9cbc9 Merge "Build should fail if any proto file fails compiling" 2012-01-30 13:00:49 -08:00
James Dong
7a93b48ad9 Added libstagefright_soft_aacenc to all builds of all products
o related-to-bug: 5939000

Change-Id: I938890486ba560d598888a3dd73c8b16d3d82aa0
2012-01-30 12:29:18 -08:00
Ying Wang
707328a3ef Build should fail if any proto file fails compiling
When compile multipling proto files to Java in a for loop.

Change-Id: Ie6a9d3972401b0ad6406bf911db916fcbf88037b
2012-01-30 11:56:07 -08:00
Scott Main
077868f8cd am c73e26f3: am dc7418b2: docs: add images for g+ homepage announcement
* commit 'c73e26f3bd038b17e60e24d0ed4d6e125bc2ef00':
  docs: add images for g+ homepage announcement
2012-01-30 10:06:28 -08:00
Scott Main
c73e26f3bd am dc7418b2: docs: add images for g+ homepage announcement
* commit 'dc7418b282faf264c495e82a5bc3366e8348676c':
  docs: add images for g+ homepage announcement
2012-01-30 10:04:17 -08:00
Scott Main
dc7418b282 docs: add images for g+ homepage announcement
Change-Id: I36430a1885be368218e1c896d6fc008355096a06
2012-01-30 09:53:13 -08:00
Xavier Ducrohet
160711d016 Add missing tools jar to the sdk product modules.
Change-Id: Ifb44f38bd3d5d710fce1b6da11b40a524c3d09d8
2012-01-27 16:45:09 -08:00
Xavier Ducrohet
65f706a42a Add annotations to the sdk build.
Change-Id: I4f13648f74c80f7ec13545066cdebd67e805d82e
2012-01-27 15:45:35 -08:00
The Android Automerger
9c20c510ff IMM26 2012-01-26 18:32:53 -08:00
The Android Automerger
f0ee4753f0 merge in ics-mr1-release history after reset to ics-mr1 2012-01-26 18:31:51 -08:00
Raphael Moll
347f305181 Move Windows SDK whitelist out of main.mk
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

Change-Id: Id6178b000c464c989da2c7f22977986a60de1f44
2012-01-26 15:11:46 -08:00
The Android Automerger
87203f0537 IMM25 2012-01-25 12:11:56 -08:00
The Android Automerger
7cfa720c56 merge in ics-mr1-release history after reset to ics-mr1 2012-01-25 12:07:31 -08:00
Dianne Hackborn
512ce9cb42 You know back when I said this thing about Ice Cream Sandwich MR2?
What was I thinking?

That would be *ridiculous*.

What sane person would come up with a release like that?!?

I mean...  four words!  Six if you try to say it!  Insane!!

Instead, we shall call you:

Jelly Bean.

Yum.

Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
2012-01-25 11:21:37 -08:00
The Android Automerger
bce3fae6a5 IMM24 2012-01-24 13:35:44 -08:00
The Android Automerger
18d6896799 merge in ics-mr1-release history after reset to ics-mr1 2012-01-24 13:31:44 -08:00
Jean-Baptiste Queru
922196c332 am 40101047: am 7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
* commit '4010104732bdae0de5027c4241db5d3cb6230252':
  Remove non-existent AlarmProvider to fix SDK build.
2012-01-24 08:44:22 -08:00
Jean-Baptiste Queru
4010104732 am 7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
* commit '7a8efe57a9505940cd51c7664e8643ec9da9d24d':
  Remove non-existent AlarmProvider to fix SDK build.
2012-01-24 08:38:57 -08:00
Jean-Baptiste Queru
7a8efe57a9 Merge "Remove non-existent AlarmProvider to fix SDK build." 2012-01-24 07:50:02 -08:00
The Android Automerger
a45eafea13 IMM20C 2012-01-23 16:55:54 -08:00
Ying Wang
c3dbeb5df1 Remove non-existent AlarmProvider to fix SDK build.
Change-Id: Ifcd087b9022f29b4b7065a72cafbbc6b3704860b
2012-01-23 10:53:23 -08:00
The Android Open Source Project
a09c28a619 am 51475183: Reconcile with ics-mr1-release
* commit '514751834753b30d37eae591ccce2e69e3468602':
  IMM20B
  IMM20
2012-01-23 10:41:27 -08:00
The Android Open Source Project
5147518347 Reconcile with ics-mr1-release
Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11
2012-01-23 10:15:33 -08:00
The Android Open Source Project
03e1c3f3a9 am c541cd6e: Reconcile with ics-mr1-release
* commit 'c541cd6ecb59fdaa339585c48395d06ccd03867e':
  IMM19
2012-01-20 16:37:56 -08:00
The Android Automerger
ec87a47401 IMM20B 2012-01-20 16:31:06 -08:00
The Android Automerger
5cb3f9d271 IMM20 2012-01-20 16:15:22 -08:00
The Android Automerger
282074349f merge in ics-mr1-release history after reset to ics-mr1 2012-01-20 16:11:14 -08:00
The Android Open Source Project
a7fbf6769c am c9054b11: Reconcile with ics-mr1-release
* commit 'c9054b11fa3895fe70b2eaba849c6388df449c1e':
  IMM18
  IMM13
  IMM12
2012-01-20 15:52:13 -08:00
Ying Wang
fcf246c989 Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.
Change-Id: I2b1de0a253d341bcb7ee05fdc96bdc0d0967985e
2012-01-20 12:59:58 -08:00
The Android Open Source Project
c541cd6ecb Reconcile with ics-mr1-release
Change-Id: I3bdc5d19073e63e031b684bede64b1f5ebdf13e7
2012-01-20 10:25:20 -08:00