Commit graph

7608 commits

Author SHA1 Message Date
The Android Open Source Project
62a16e2305 Reconcile with ics-mr1-release
Change-Id: I8399f0a69c4192e7ef65e3097e7a6820e400e436
2012-02-07 10:09:02 -08:00
The Android Automerger
a7af7e050e IMM30D 2012-02-06 20:29:06 -08:00
Ed Heyl
ca2cd25b35 am daeb1d90: am c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit 'daeb1d90415f645269d10d7d61c17c59a5cad61f':
  Please do not merge (already submitted downstream); check entire recovery partition on startup
2012-02-06 13:09:03 -08:00
Ed Heyl
daeb1d9041 am c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit 'c547a4d50b92c8f8173bf4222169f87200a76dba':
  Please do not merge (already submitted downstream); check entire recovery partition on startup
2012-02-06 13:07:38 -08:00
Ed Heyl
c547a4d50b Please do not merge (already submitted downstream); check entire recovery partition on startup
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.

Bug: 5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
2012-02-06 13:03:43 -08:00
The Android Automerger
7134fbe50f IMM30C 2012-02-06 08:44:05 -08:00
The Android Automerger
7410fbd593 IMM3C 2012-02-06 08:42:38 -08:00
Jean-Baptiste Queru
5aec09b5f3 am 9a741915: Merge "Add annotations to the sdk build."
* commit '9a7419153e7fffa6056a24b567ff3f45111aa0c0':
  Add annotations to the sdk build.
2012-02-02 22:34:18 -08:00
Jean-Baptiste Queru
9a7419153e Merge "Add annotations to the sdk build." 2012-02-02 13:43:07 -08:00
Xavier Ducrohet
d79f950820 Add annotations to the sdk build.
Change-Id: I22ab1e737f05f6134ec9701c8ed69642a3708fbf
2012-02-02 13:41:19 -08:00
The Android Open Source Project
402e36f189 Reconcile with ics-mr1-release
Change-Id: Icc486a00d6c067c87364023fcf7226686dc0642a
2012-02-01 08:42:31 -08:00
The Android Automerger
9ffda11f19 IMM30B 2012-01-31 16:24:20 -08:00
The Android Automerger
c1c74182e3 IMM29 2012-01-31 15:43:31 -08:00
The Android Automerger
04b1cdbe28 merge in ics-mr1-release history after reset to ics-mr1 2012-01-31 15:40:59 -08:00
Scott Main
a57f538a22 am 7f24ddbc: Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1
* commit '7f24ddbc75b301cd3520e8fefaeb2e94a6dcc80b':
  docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
2012-01-31 15:21:32 -08:00
Scott Main
7f24ddbc75 Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1 2012-01-31 15:19:44 -08:00
Scott Main
1c9630ea4a docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
Change-Id: I37551efd09bea528200a93a8d3602ea11e63f140
2012-01-31 15:18:47 -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
The Android Automerger
a925a6e2a5 IMM26B 2012-01-30 23:40:32 -08:00
The Android Automerger
ba00f9e491 IMM26 2012-01-30 23:38:52 -08:00
The Android Automerger
424e71c5a7 IMM26B 2012-01-30 23:33:57 -08:00
The Android Automerger
527c773f5d merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:21 -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
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
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
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
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
Haruyasu Ishida
5c97da76ad Fix for "dexopt: No such file or directory" error
When common_javalib.jar is created, both LOCAL_BUILT_MODULE and
built_odex targets can be run.

If built_odex target runs before the directory is created by
LOCAL_BUILT_MODULE target, the error occurs.

Change-Id: I1ebcb27630f8373558da6acdfce95f5cdf714bbf
2012-01-27 09:25:20 +01: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
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
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
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
5147518347 Reconcile with ics-mr1-release
Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11
2012-01-23 10:15:33 -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