OSDN Git Service

android-x86/build.git
11 years agohost modules don't need LOCAL_MODULE_TAGS
Joe Onorato [Sat, 19 May 2012 03:43:41 +0000 (20:43 -0700)]
host modules don't need LOCAL_MODULE_TAGS

Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d

11 years agoDon't give the user tag to host modules automatically.
Joe Onorato [Sat, 19 May 2012 03:43:14 +0000 (20:43 -0700)]
Don't give the user tag to host modules automatically.

Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7

11 years agoAdd a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Joe Onorato [Sat, 19 May 2012 03:41:38 +0000 (20:41 -0700)]
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.

Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994

11 years agoAdd tool to parse make dependency info from new --deps flag.
Joe Onorato [Sat, 19 May 2012 03:39:51 +0000 (20:39 -0700)]
Add tool to parse make dependency info from new --deps flag.

Change-Id: I59a88027d88cceee9f2933c84379612698952043

11 years agoUse a more modern -j flag.
Joe Onorato [Tue, 8 May 2012 02:21:51 +0000 (19:21 -0700)]
Use a more modern -j flag.

Change-Id: I2498139dd41637a795ca43f830c952adb2856d83

11 years agomake product-graph now filtered
Joe Onorato [Tue, 8 May 2012 00:15:15 +0000 (17:15 -0700)]
make product-graph now filtered

Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208

11 years agoMerge "select.mk: Tune ccache options"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:55:25 +0000 (14:55 -0700)]
Merge "select.mk: Tune ccache options"

11 years agoselect.mk: Tune ccache options
Andrew Boie [Mon, 13 Aug 2012 20:45:50 +0000 (13:45 -0700)]
select.mk: Tune ccache options

With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:

* Compiler binary modification time no longer causes cache misses,
  as a hash of the compiler binary is taken rather than looking
  at the mtime and size
* Header file modification time no longer causes cache misses,
  the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative

These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.

Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
11 years agoMerge "The zoneinfo stuff is no longer legacy."
Elliott Hughes [Thu, 16 Aug 2012 02:43:40 +0000 (19:43 -0700)]
Merge "The zoneinfo stuff is no longer legacy."

11 years agoThe zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 01:34:49 +0000 (18:34 -0700)]
The zoneinfo stuff is no longer legacy.

Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585

11 years agoMerge "Set the AOSP master to be API level 16"
Jean-Baptiste Queru [Tue, 14 Aug 2012 17:51:21 +0000 (10:51 -0700)]
Merge "Set the AOSP master to be API level 16"

11 years agoSet the AOSP master to be API level 16
Jean-Baptiste Queru [Tue, 14 Aug 2012 16:07:33 +0000 (09:07 -0700)]
Set the AOSP master to be API level 16

Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66

11 years agoMerge "Move the selinux modules to core PRODUCT_PACKAGES"
Ying Wang [Mon, 13 Aug 2012 22:41:12 +0000 (15:41 -0700)]
Merge "Move the selinux modules to core PRODUCT_PACKAGES"

11 years agoMove the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 22:03:00 +0000 (15:03 -0700)]
Move the selinux modules to core PRODUCT_PACKAGES

The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.

Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a

11 years agoMerge "Add mac_permissions.xml dependency."
Ying Wang [Mon, 13 Aug 2012 21:52:24 +0000 (14:52 -0700)]
Merge "Add mac_permissions.xml dependency."

12 years agoMerge "Remove TARGET_linux-sh.mk."
Elliott Hughes [Sat, 11 Aug 2012 16:34:51 +0000 (09:34 -0700)]
Merge "Remove TARGET_linux-sh.mk."

12 years agoRemove TARGET_linux-sh.mk.
Elliott Hughes [Fri, 10 Aug 2012 22:36:51 +0000 (15:36 -0700)]
Remove TARGET_linux-sh.mk.

SH support is long gone from bionic and dalvik.

Change-Id: I613df5f0062d743686847610737af9a321eec1da

12 years agoMerge "MIPS support to *.mk files and envsetup.sh"
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:16:20 +0000 (09:16 -0700)]
Merge "MIPS support to *.mk files and envsetup.sh"

12 years agoMIPS support to *.mk files and envsetup.sh
Raghu Gandham [Thu, 26 Jul 2012 02:57:22 +0000 (19:57 -0700)]
MIPS support to *.mk files and envsetup.sh

Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
12 years agoMerge "Support for MIPS Build targets."
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:33 +0000 (08:39 -0700)]
Merge "Support for MIPS Build targets."

12 years agoMerge "Modify full_mips-eng build in line with the full-eng build"
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:09 +0000 (08:39 -0700)]
Merge "Modify full_mips-eng build in line with the full-eng build"

12 years agoMerge "x86: cleanups for toolchain"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:18 +0000 (13:40 -0700)]
Merge "x86: cleanups for toolchain"

12 years agoMerge "definitions.mk: Don't use GCC '@' parameter"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:18:56 +0000 (13:18 -0700)]
Merge "definitions.mk: Don't use GCC '@' parameter"

12 years agoMerge "core/Makefile: also look for device/*/build/tasks"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:56 +0000 (12:58 -0700)]
Merge "core/Makefile: also look for device/*/build/tasks"

12 years agoSupport for MIPS Build targets.
Raghu Gandham [Thu, 26 Jul 2012 02:57:22 +0000 (19:57 -0700)]
Support for MIPS Build targets.

Change-Id: I14c27305298ce36d5c100abf25489275c2269c5f
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
12 years agoModify full_mips-eng build in line with the full-eng build
Chris Dearman [Thu, 26 Jul 2012 02:57:22 +0000 (19:57 -0700)]
Modify full_mips-eng build in line with the full-eng build

Change-Id: Iebbad0c2a4f8f01b2ff8a08ea77965291a842636

Signed-off-by: Raghu Gandham <raghu@mips.com>
12 years agoMerge "Now zoneinfo prebuilts are Android modules."
Elliott Hughes [Fri, 27 Jul 2012 21:14:57 +0000 (14:14 -0700)]
Merge "Now zoneinfo prebuilts are Android modules."

12 years agoNow zoneinfo prebuilts are Android modules.
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.

(cherry-picked from 101d32ebb80f5f015781b98cb53739e8ad933cb4.)

Bug: 6857263
Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7

12 years agoMerge "Fix build."
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:05:22 +0000 (10:05 -0700)]
Merge "Fix build."

12 years agoFix build.
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.

Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29

12 years agodefinitions.mk: Don't use GCC '@' parameter
Andrew Boie [Wed, 11 Jul 2012 19:14:56 +0000 (12:14 -0700)]
definitions.mk: Don't use GCC '@' parameter

This parameter (which causes GCC to pull additional command line
parameters out of a file) is incompatible with ccache.

- With ccache 2.x, ccache will ignore this parameters, and potentially
compute invalid command line hashes since it is not reading the
parameter file

- With ccache 3.x, ccache will refuse to cache the files and error
with 'Unsupported compiler option'.

We still use the parameter file, but Make expands it instead.

Change-Id: I070c3877cbe2d058e1cf4754bac535e7f3498861
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
12 years agoMerge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"
Joe Onorato [Thu, 26 Jul 2012 00:56:24 +0000 (17:56 -0700)]
Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"

12 years agoShould have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
Joe Onorato [Thu, 26 Jul 2012 00:55:03 +0000 (17:55 -0700)]
Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb

Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480

12 years agoMerge "Don't try to build the emulator on Mac OS if the right tools aren't installed."
Joe Onorato [Thu, 26 Jul 2012 00:41:49 +0000 (17:41 -0700)]
Merge "Don't try to build the emulator on Mac OS if the right tools aren't installed."

12 years agoDon't try to build the emulator on Mac OS if the right tools aren't installed.
Joe Onorato [Wed, 25 Jul 2012 21:28:05 +0000 (14:28 -0700)]
Don't try to build the emulator on Mac OS if the right tools aren't installed.

Change-Id: I3cd2f82f9ee64174bddbb12a18ca8fcf23bdcebd

12 years agoMerge "Add -fuse-ld=bfd to x86 target"
Andrew Hsieh [Wed, 25 Jul 2012 20:40:30 +0000 (13:40 -0700)]
Merge "Add -fuse-ld=bfd to x86 target"

12 years agoAdd -fuse-ld=bfd to x86 target
Andrew Hsieh [Wed, 25 Jul 2012 07:35:35 +0000 (00:35 -0700)]
Add -fuse-ld=bfd to x86 target

Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".

Change-Id: Ie6fa0a2ddfc57b650552c8cf0891f738a5be0dda

12 years agoAdd mac_permissions.xml dependency.
rpcraig [Tue, 10 Jul 2012 17:02:07 +0000 (13:02 -0400)]
Add mac_permissions.xml dependency.

Include the MMAC install perms policy configuration
file to the list of SELINUX dependencies.
This changes depends on the project:

git.selinuxproject.org/~seandroid/selinux/mac-policy

Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Change-Id: Ief91d6a717741c91c5ba8745452bb247dc8048ec

12 years agoMerge "Add property_contexts to SELINUX_DEPENDS."
Nick Kralevich [Wed, 18 Jul 2012 20:55:09 +0000 (13:55 -0700)]
Merge "Add property_contexts to SELINUX_DEPENDS."

12 years agox86: cleanups for toolchain
Bruce Beare [Wed, 18 Jul 2012 04:40:01 +0000 (21:40 -0700)]
x86: cleanups for toolchain

The 4.4.3 TC was still being specified in one spot.
Also, no need to cross-set x86/ARM variables when buliding
for ARM/x86.

Change-Id: Icbb0f772a983a24dc10ccab0800d4b7bbd60a099
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
12 years agoCreate telephony-common and mms-common - DO NOT MERGE
Wink Saville [Sat, 30 Jun 2012 23:13:26 +0000 (16:13 -0700)]
Create telephony-common and mms-common - DO NOT MERGE

These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
  frameworks/opt/mms

telephony-common was created by moving some of
  frameworks/base/telephony
to:
  frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0

12 years agocore/Makefile: also look for device/*/build/tasks
Andrew Boie [Mon, 16 Apr 2012 17:03:16 +0000 (10:03 -0700)]
core/Makefile: also look for device/*/build/tasks

This eases cross-repo dependencies between device/ and
vendor/.

Change-Id: I72e283d22f16e50555ec7ba7bcf9c61ea07f083c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
12 years agoAdd property_contexts to SELINUX_DEPENDS.
rpcraig [Thu, 5 Jul 2012 14:50:27 +0000 (10:50 -0400)]
Add property_contexts to SELINUX_DEPENDS.

This ensures there is a dependency between the root image
and changes to property_contexts file.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Change-Id: I9bd2c3fc44015d6013e6a1f200f8abded271654f

12 years agoReconcile with jb-release
The Android Open Source Project [Wed, 4 Jul 2012 23:48:36 +0000 (16:48 -0700)]
Reconcile with jb-release

Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da

12 years agoJRO03C
The Android Automerger [Wed, 4 Jul 2012 20:53:25 +0000 (13:53 -0700)]
JRO03C

12 years agoam 38f19c21: Merge "docs: fix search suggestions and other script bugs for offline...
Scott Main [Tue, 3 Jul 2012 21:15:43 +0000 (14:15 -0700)]
am 38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev

* commit '38f19c21258592faefa652d4871d570e151a2a53':
  docs: fix search suggestions and other script bugs for offline docs

12 years agoMerge "docs: fix search suggestions and other script bugs for offline docs" into...
Scott Main [Tue, 3 Jul 2012 21:10:57 +0000 (14:10 -0700)]
Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev

12 years agoReconcile with jb-release
The Android Open Source Project [Tue, 3 Jul 2012 21:09:18 +0000 (14:09 -0700)]
Reconcile with jb-release

Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec

12 years agodocs: fix search suggestions and other script bugs for offline docs
Scott Main [Tue, 3 Jul 2012 21:06:22 +0000 (14:06 -0700)]
docs: fix search suggestions and other script bugs for offline docs

Change-Id: I3f9404695966b99be1c8ed36249788e448399296

12 years agoIgnore version change from jb-dev
Jean-Baptiste Queru [Tue, 3 Jul 2012 21:04:28 +0000 (14:04 -0700)]
Ignore version change from jb-dev

Change-Id: Ia04c4664cba4abdef04f0949713f4c76281713d8

12 years agoJRO03B
The Android Automerger [Tue, 3 Jul 2012 21:00:39 +0000 (14:00 -0700)]
JRO03B

12 years ago4.1.1
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1

Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5

12 years agoMerge "4.1.1" into jb-dev
Ed Heyl [Tue, 3 Jul 2012 20:57:52 +0000 (13:57 -0700)]
Merge "4.1.1" into jb-dev

12 years ago4.1.1
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1

Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5

12 years agoReconcile with jb-release
The Android Open Source Project [Tue, 3 Jul 2012 20:30:52 +0000 (13:30 -0700)]
Reconcile with jb-release

Change-Id: I23dd2b4acc6d2ca20756d6d674272a2721843d20

12 years agoJRO02D
The Android Automerger [Tue, 3 Jul 2012 19:58:46 +0000 (12:58 -0700)]
JRO02D

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 3 Jul 2012 19:50:47 +0000 (12:50 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."
Ying Wang [Tue, 3 Jul 2012 19:16:03 +0000 (12:16 -0700)]
am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."

* commit '9e38d6bf1bf78a00d8f4288e6444be358a70a692':
  This property is set when HAVE_SELINUX:=true during build.

12 years agoReconcile with jb-release
The Android Open Source Project [Tue, 3 Jul 2012 19:11:41 +0000 (12:11 -0700)]
Reconcile with jb-release

Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11

12 years agoMerge "This property is set when HAVE_SELINUX:=true during build."
Ying Wang [Tue, 3 Jul 2012 18:30:30 +0000 (11:30 -0700)]
Merge "This property is set when HAVE_SELINUX:=true during build."

12 years agoThis property is set when HAVE_SELINUX:=true during build.
William Roberts [Tue, 3 Jul 2012 01:55:14 +0000 (18:55 -0700)]
This property is set when HAVE_SELINUX:=true during build.

This will provide a convenient method for determing build
configuration when in the Java layer. For instance, this will
be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68
to determine if the Settings app should display the SE Linux
status.

Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f

12 years agoJRO02C
The Android Automerger [Tue, 3 Jul 2012 02:03:14 +0000 (19:03 -0700)]
JRO02C

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 3 Jul 2012 01:58:01 +0000 (18:58 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoJRO02B
The Android Automerger [Mon, 2 Jul 2012 23:25:03 +0000 (16:25 -0700)]
JRO02B

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 23:16:18 +0000 (16:16 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoJRO02
The Android Automerger [Mon, 2 Jul 2012 20:00:27 +0000 (13:00 -0700)]
JRO02

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 19:53:12 +0000 (12:53 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
Ying Wang [Sat, 30 Jun 2012 03:19:50 +0000 (20:19 -0700)]
am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"

* commit 'e42ed0ba1571f20866609710ba7c73fd138c0405':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk

12 years agoMerge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
Ying Wang [Sat, 30 Jun 2012 02:55:06 +0000 (19:55 -0700)]
Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"

12 years agoReconcile with jb-release
The Android Open Source Project [Sat, 30 Jun 2012 01:28:17 +0000 (18:28 -0700)]
Reconcile with jb-release

Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25

12 years agoJRN90
The Android Automerger [Fri, 29 Jun 2012 22:57:58 +0000 (15:57 -0700)]
JRN90

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 29 Jun 2012 22:47:16 +0000 (15:47 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoReconcile with jb-release
The Android Open Source Project [Fri, 29 Jun 2012 15:13:34 +0000 (08:13 -0700)]
Reconcile with jb-release

Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc

12 years agoJRN89B
The Android Automerger [Fri, 29 Jun 2012 00:16:17 +0000 (17:16 -0700)]
JRN89B

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 29 Jun 2012 00:06:01 +0000 (17:06 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMove the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
Ying Wang [Thu, 28 Jun 2012 23:02:19 +0000 (16:02 -0700)]
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk

Bug: 6754632
So the warning won't show up when you run lunch.
Now the warning only shows when you do a clean build.

Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7

12 years agoam f973ced3: docs: better message for download page when os detection fails
Scott Main [Thu, 28 Jun 2012 19:01:03 +0000 (12:01 -0700)]
am f973ced3: docs: better message for download page when os detection fails

* commit 'f973ced37e2d065c0aa41bb5563abad7518bea61':
  docs: better message for download page when os detection fails

12 years agodocs: better message for download page when os detection fails
Scott Main [Thu, 28 Jun 2012 18:56:01 +0000 (11:56 -0700)]
docs: better message for download page when os detection fails

Change-Id: I940c0847ddc214ef36bfd0708d289cff200dfc62

12 years agoJRN89
The Android Automerger [Thu, 28 Jun 2012 14:08:48 +0000 (07:08 -0700)]
JRN89

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 28 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoJRN88
The Android Automerger [Wed, 27 Jun 2012 21:15:09 +0000 (14:15 -0700)]
JRN88

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 27 Jun 2012 21:04:29 +0000 (14:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam 810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a...
Scott Main [Wed, 27 Jun 2012 09:25:12 +0000 (02:25 -0700)]
am 810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it\'s a worthwhile compromise and will investigate a diff solution for that later.

* commit '810e28891457af6e365b839ac584d77277b2e3fa':
  docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it's a worthwhile compromise and will investigate a diff solution for that later.

12 years agodocs: fix overlapping sidebar bug,
Scott Main [Wed, 27 Jun 2012 09:08:20 +0000 (02:08 -0700)]
docs: fix overlapping sidebar bug,
but I think this re-introduces a bug in IE where the sidenav
position moves slightly left/right during scroll, but it's a
worthwhile compromise and will investigate a diff solution for that later.

Change-Id: Id1f2141b6638e199d1a4ad1d198a5a5aa45bf264

12 years agoam 03c972c5: docs: misc css
Scott Main [Wed, 27 Jun 2012 05:26:18 +0000 (22:26 -0700)]
am 03c972c5: docs: misc css

* commit '03c972c5c6d42597c8fe0127161d6536ee98d04b':
  docs: misc css

12 years agodocs: misc css
Scott Main [Wed, 27 Jun 2012 05:23:22 +0000 (22:23 -0700)]
docs: misc css

Change-Id: I398d30f9414564f58ea3546a192ad1c12e715349

12 years agoJRN87
The Android Automerger [Tue, 26 Jun 2012 18:15:56 +0000 (11:15 -0700)]
JRN87

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 26 Jun 2012 18:07:24 +0000 (11:07 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoReconcile with jb-release
The Android Open Source Project [Tue, 26 Jun 2012 14:18:15 +0000 (07:18 -0700)]
Reconcile with jb-release

Change-Id: Iab5346490b6838a2137ffd28e72e4f8d4e9f48da

12 years agoJRN84D
The Android Automerger [Tue, 26 Jun 2012 00:24:56 +0000 (17:24 -0700)]
JRN84D

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 26 Jun 2012 00:14:15 +0000 (17:14 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoJRN84C
The Android Automerger [Tue, 26 Jun 2012 00:05:30 +0000 (17:05 -0700)]
JRN84C

12 years agoReconcile with jb-release
The Android Open Source Project [Mon, 25 Jun 2012 19:18:24 +0000 (12:18 -0700)]
Reconcile with jb-release

Change-Id: I2b5cf5780851a3979016a50ff39f7da6d6d1a82b

12 years agoJRN84B
The Android Automerger [Mon, 25 Jun 2012 18:31:30 +0000 (11:31 -0700)]
JRN84B

12 years agoJRN86
The Android Automerger [Mon, 25 Jun 2012 18:29:39 +0000 (11:29 -0700)]
JRN86

12 years agoReconcile with jb-release
The Android Open Source Project [Mon, 25 Jun 2012 14:57:11 +0000 (07:57 -0700)]
Reconcile with jb-release

Change-Id: I80e21c4019904a7f755af426e3e29e41c9b23f78

12 years agoJRN84
The Android Automerger [Sun, 24 Jun 2012 06:28:18 +0000 (23:28 -0700)]
JRN84

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 24 Jun 2012 06:13:39 +0000 (23:13 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam 9ada2264: docs: darker font color
Scott Main [Sun, 24 Jun 2012 00:52:58 +0000 (17:52 -0700)]
am 9ada2264: docs: darker font color

* commit '9ada22647890c18ded2b890d00c0a307bd2bed98':
  docs: darker font color

12 years agodocs: darker font color
Scott Main [Sat, 23 Jun 2012 21:59:36 +0000 (14:59 -0700)]
docs: darker font color

Change-Id: I8fe4117ac501001dd6c7156b337f3ff7a4f75793