OSDN Git Service
Colin Cross [Tue, 24 Apr 2012 01:49:04 +0000 (18:49 -0700)]
Set timestamps of files from platform.zip to current time
Touch files unzipped from platform.zip to update their timestamp.
Prevents make dependency confusion from files with old times.
Also add a dependency for the implicit copy rule on the
pdk_fusion.stamp file to force make to use the updated
files.
Change-Id: Ia54454518d229ce3670023819836f586fef65d3f
Keun young Park [Thu, 19 Apr 2012 22:36:18 +0000 (15:36 -0700)]
enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build
Bug:
6352960
Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
Keun young Park [Fri, 20 Apr 2012 23:20:42 +0000 (16:20 -0700)]
Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK""
Keun young Park [Fri, 20 Apr 2012 23:18:34 +0000 (16:18 -0700)]
Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
This reverts commit
9283168e61a4991d39a6c599627eefc45d41c099
Colin Cross [Fri, 20 Apr 2012 22:44:29 +0000 (15:44 -0700)]
Merge "Move pdk fusion platform.zip file under vendor/pdk"
Keun young Park [Fri, 20 Apr 2012 19:02:34 +0000 (12:02 -0700)]
Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
Scott Main [Fri, 20 Apr 2012 17:38:51 +0000 (10:38 -0700)]
am
ac2c989e: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
ac2c989e8492a733bdd3d4c7e1bedd5210c56c8d':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Scott Main [Fri, 20 Apr 2012 17:35:11 +0000 (10:35 -0700)]
am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Scott Main [Fri, 20 Apr 2012 17:19:54 +0000 (10:19 -0700)]
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Change-Id: I0125b1d585a0adde7f5f485f3288fdc7a8a55faf
Keun young Park [Thu, 19 Apr 2012 22:36:18 +0000 (15:36 -0700)]
enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK
Bug:
6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
Scott Main [Fri, 20 Apr 2012 02:30:33 +0000 (19:30 -0700)]
am
1882adfd: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
1882adfd49b392acb6efe66a09bf753e1c830eef':
docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:27:59 +0000 (19:27 -0700)]
am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:23:04 +0000 (19:23 -0700)]
docs: update doc template to make the Resources side nav wider (+40px)
Change-Id: I173e64d57f9ec31bf0c3912bca5d46a5f7c78338
Colin Cross [Fri, 20 Apr 2012 00:15:44 +0000 (17:15 -0700)]
Merge changes I9a390206,If3e9e846
* changes:
build: separate dist tools and ota tools
build: remove unused ota tools
Jean-Baptiste Queru [Thu, 19 Apr 2012 22:06:10 +0000 (15:06 -0700)]
Merge "Use an https URL"
Jean-Baptiste Queru [Thu, 19 Apr 2012 21:53:27 +0000 (14:53 -0700)]
Use an https URL
Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
Iliyan Malchev [Tue, 10 Apr 2012 22:09:11 +0000 (15:09 -0700)]
vbox_x86: add a 256M ext4 cache partition
Change-Id: If88895f60308673526a579a96d5b1ed9206c0241
Signed-off-by: Iliyan Malchev <malchev@google.com>
Colin Cross [Thu, 19 Apr 2012 20:54:39 +0000 (13:54 -0700)]
build: separate dist tools and ota tools
aapt is not needed for a dist build and not available in a pdk dist
build. Create a new list DISTTOOLS that dist builds depends on,
and change OTATOOLS to be DISTTOOLS plus aapt, which is build by
make otatools.
Change-Id: I9a39020640b0e2cade8073aa14ee2ada9a20d78b
Colin Cross [Thu, 19 Apr 2012 20:26:00 +0000 (13:26 -0700)]
build: remove unused ota tools
genext2fs, tune2fs, and e2fsck are no longer used by mkuserimg.sh.
Change-Id: If3e9e846e021de0973bde2702e60acdc9f4c57c7
Keun young Park [Thu, 19 Apr 2012 17:25:20 +0000 (10:25 -0700)]
Merge "enable recovery img build for PDK"
Keun young Park [Thu, 19 Apr 2012 16:55:24 +0000 (09:55 -0700)]
enable recovery img build for PDK
Bug:
6363041
Change-Id: I25dff887dd0946c9506926e66e0514390c20692e
Colin Cross [Thu, 19 Apr 2012 07:50:00 +0000 (00:50 -0700)]
Move pdk fusion platform.zip file under vendor/pdk
Look for the platform.zip file in:
vendor/pdk/DEVICE/PRODUCT-BUILD_VARIANT/platform/platform.zip
Change-Id: I275029842fdf13867d5141549ca8c39abb23600b
Ying Wang [Thu, 19 Apr 2012 00:35:55 +0000 (17:35 -0700)]
Write out export_includes whenever the module is built.
Bug:
6362268
Change-Id: If872cf8fe597a02e6ca740a181cea85f486df98e
Ying Wang [Wed, 18 Apr 2012 23:55:27 +0000 (16:55 -0700)]
Merge "Revert "Write out export_includes whenever the module is built.""
Ying Wang [Wed, 18 Apr 2012 23:55:07 +0000 (16:55 -0700)]
Revert "Write out export_includes whenever the module is built."
This reverts commit
40c34f3778e778762c7a7dcaf8697b2c90a717de
Ying Wang [Wed, 18 Apr 2012 23:38:00 +0000 (16:38 -0700)]
Merge "Write out export_includes whenever the module is built."
Ying Wang [Wed, 18 Apr 2012 23:30:17 +0000 (16:30 -0700)]
Write out export_includes whenever the module is built.
Bug:
6362268
Change-Id: Ic5d028c108423c694736a06c05ec13093d42f1b8
Brett Chabot [Wed, 18 Apr 2012 21:56:18 +0000 (14:56 -0700)]
Merge "Add smoke tests to sdk build."
Ying Wang [Wed, 18 Apr 2012 01:10:11 +0000 (18:10 -0700)]
Add back ARM_EABI_TOOLCHAIN.
ARM_EABI_TOOLCHAIN is still used by the kernel build.
Change-Id: I5cdad0b478c0836e06a2af567e4e212602da1f3b
Mike Lockwood [Tue, 17 Apr 2012 17:40:04 +0000 (10:40 -0700)]
Merge "core.mk: Add rule for init.usb.rc"
David 'Digit' Turner [Tue, 17 Apr 2012 12:50:47 +0000 (14:50 +0200)]
resolved conflicts for merge of
296e4828 to master
Change-Id: Iae41a458f1eed497119c3abe4bf27194821c075d
David Turner [Tue, 17 Apr 2012 11:51:52 +0000 (04:51 -0700)]
am
81d54025: am
f04ee373: Merge "Update gdbclient for x86 target"
* commit '
81d54025c75793c9f8cb2290c81b4075f9274be1':
Update gdbclient for x86 target
David Turner [Tue, 17 Apr 2012 11:49:17 +0000 (04:49 -0700)]
am
f04ee373: Merge "Update gdbclient for x86 target"
* commit '
f04ee373123fab58dfd3adc06966cfe127abf6a6':
Update gdbclient for x86 target
David Turner [Tue, 17 Apr 2012 09:27:48 +0000 (02:27 -0700)]
Merge "Update gdbclient for x86 target"
Brett Chabot [Tue, 17 Apr 2012 01:29:48 +0000 (18:29 -0700)]
Add smoke tests to sdk build.
Change-Id: If614ad21b3323e16b358f248c44c15b0fe5f0e9a
Andrew Flynn [Mon, 16 Apr 2012 17:25:27 +0000 (10:25 -0700)]
Merge "Default ro.carrier to unknown"
Andrew Flynn [Fri, 13 Apr 2012 15:53:44 +0000 (08:53 -0700)]
Default ro.carrier to unknown
This was previously performed by init.c
Change-Id: Id34c636e06dfe2766446f909e9d05557163d812d
Eric Laurent [Sat, 14 Apr 2012 15:49:33 +0000 (08:49 -0700)]
Merge "Fix problem with audio policy configuration file."
Eric Laurent [Sat, 14 Apr 2012 01:58:20 +0000 (18:58 -0700)]
Fix problem with audio policy configuration file.
Having the copy of default audio_policy.conf file in generic_no_telephony.mk
doesn't work because of multiple inheritance on certain products.
Move it to board/generic/device.mk to be consistent with how the audio HAL
modules are managed.
Issue
6333980.
Change-Id: If6053ad596b6f693f43c72ba9cc54cb7a7cfa233
Jean-Baptiste Queru [Fri, 13 Apr 2012 20:37:56 +0000 (13:37 -0700)]
Whitelist widevine
Change-Id: I4863b335ebc02d642874a4dd3dd9a8af93455d7b
Kevin Hester [Fri, 13 Apr 2012 14:53:58 +0000 (07:53 -0700)]
am
6c703628: Allow packages to place manifest files in any directory
* commit '
6c703628c54275797caf2b524686d3dd2e34385c':
Allow packages to place manifest files in any directory
Kevin Hester [Thu, 12 Apr 2012 17:20:53 +0000 (10:20 -0700)]
Allow packages to place manifest files in any directory
via a new definition LOCAL_ABS_MANIFEST_FILE. The existing
LOCAL_MANIFEST_FILE variable will also be supported.
(Necessary if manifests are being programmatically generated in the
intermediates directory)
Change-Id: I77a8eb1b8040b966b944464281d00c161ff34d3c
Robert Greenwalt [Tue, 27 Mar 2012 23:53:27 +0000 (16:53 -0700)]
Add MDNS to the build.
Change-Id: I025fe959a38344bb072ec13701f934a4fb9a5f36
Colin Cross [Thu, 12 Apr 2012 20:25:54 +0000 (13:25 -0700)]
Merge event-log-tags from platform.zip with local *.logtags
PDK fusion builds will include system/etc/event-log-tags from a full
build from platform.zip, which needs to be merged into the event-log-tags
built locally based on *.logtags from projects that have source.
Bug:
6297675
Change-Id: I91409f37c6dc88d6942eade2946155c2a6640b6f
Stephen Hines [Thu, 12 Apr 2012 06:35:03 +0000 (23:35 -0700)]
Merge "More Clang tweaks to the build system."
Mike Lockwood [Fri, 6 Apr 2012 20:20:18 +0000 (13:20 -0700)]
core.mk: Add rule for init.usb.rc
Change-Id: I2068c08648aad26bbfb35a6a7890757b5d8b01c9
Signed-off-by: Mike Lockwood <lockwood@google.com>
Eric Laurent [Wed, 11 Apr 2012 01:05:08 +0000 (18:05 -0700)]
Merge "Fix audio broken for sdk builds."
Eric Laurent [Wed, 11 Apr 2012 00:59:22 +0000 (17:59 -0700)]
Fix audio broken for sdk builds.
Add missing audio policy configuration file copy for sdk product.
Issue
6289703.
Change-Id: Ica9ce813d945dd76b836c8bd68f3e168a7d537e0
Andreas Huber [Tue, 10 Apr 2012 21:54:38 +0000 (14:54 -0700)]
Merge "Revert "ARM: compile everything with relro / bind_now.""
Raphael Moll [Tue, 10 Apr 2012 21:48:50 +0000 (14:48 -0700)]
am
048d741f: am
8f5c42e7: am
2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
* commit '
048d741f0ae835928cc9419d15db187a26e594bb':
Merge "SDK: Also read sdk/build/tools.OS.atree"
Raphael Moll [Tue, 10 Apr 2012 21:46:43 +0000 (14:46 -0700)]
am
8f5c42e7: am
2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
* commit '
8f5c42e778afc5a3bfa2c6a1c6258889690a558b':
Merge "SDK: Also read sdk/build/tools.OS.atree"
Raphael Moll [Tue, 10 Apr 2012 21:44:37 +0000 (14:44 -0700)]
am
2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
* commit '
2db32730e79cafcf13e1f898a7bee7f82b0449d6':
Merge "SDK: Also read sdk/build/tools.OS.atree"
Ying Wang [Tue, 10 Apr 2012 20:59:26 +0000 (13:59 -0700)]
Merge "Merge the NOTICE files when doing pdk fusion build."
Nick Kralevich [Tue, 10 Apr 2012 20:13:29 +0000 (13:13 -0700)]
Revert "ARM: compile everything with relro / bind_now."
This reverts commit
020e4919e89a824783dbe8716bc56785267323f7.
Raphael Moll [Tue, 10 Apr 2012 19:45:47 +0000 (12:45 -0700)]
Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
Raphael Moll [Fri, 2 Mar 2012 20:40:04 +0000 (12:40 -0800)]
Merge "SDK: Also read sdk/build/tools.OS.atree"
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.
(cherry picked from commit
3ab307a68cbc30ab37d15f62e88dd19b51ac9632)
Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24
Jean-Baptiste Queru [Tue, 10 Apr 2012 18:14:03 +0000 (11:14 -0700)]
am
6c7fd59d: am
33c98d9a: am
59d7372d: Merge "Bump DX Java heap to 2GB."
* commit '
6c7fd59d96930183bc6847423892ba797be3bba6':
Bump DX Java heap to 2GB.
Jean-Baptiste Queru [Tue, 10 Apr 2012 18:11:50 +0000 (11:11 -0700)]
am
33c98d9a: am
59d7372d: Merge "Bump DX Java heap to 2GB."
* commit '
33c98d9ab283913b7b76d8a33e138aafe9724d68':
Bump DX Java heap to 2GB.
Jean-Baptiste Queru [Tue, 10 Apr 2012 18:09:40 +0000 (11:09 -0700)]
am
59d7372d: Merge "Bump DX Java heap to 2GB."
* commit '
59d7372dec8b4befa06496b94bd7eef06d506696':
Bump DX Java heap to 2GB.
Mark D Horn [Wed, 14 Mar 2012 21:20:30 +0000 (14:20 -0700)]
Update gdbclient for x86 target
Check the Target Architecture to choose the correct
version of the gdb client.
Change-Id: I1d75df235a18e60c6a7142a95c93b0fce69ee736
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Ying Wang [Tue, 10 Apr 2012 00:04:12 +0000 (17:04 -0700)]
Merge the NOTICE files when doing pdk fusion build.
Bug:
6297249
Change-Id: I693ab15e5a2eacda3c8b9d2ce36469ea177ae178
Jean-Baptiste Queru [Tue, 10 Apr 2012 16:39:08 +0000 (09:39 -0700)]
Merge "Bump DX Java heap to 2GB."
Jean-Baptiste Queru [Tue, 10 Apr 2012 15:21:21 +0000 (08:21 -0700)]
Bump DX Java heap to 2GB.
Change-Id: I240a24f9bb8511fea8f420f76b4541018ae79a0c
Evgeniy Stepanov [Thu, 5 Apr 2012 07:44:37 +0000 (11:44 +0400)]
More Clang tweaks to the build system.
Adds arm_neon.h to the include path when building with Clang.
Filters out 3 additional compiler flags when building with Clang.
Filters out unsupported flags from TARGET_(arm|thumb)_CFLAGS, as well.
Change-Id: I5e23a95356e0b10c31c9aa3cb4905f6a674709e4
Kenny Root [Mon, 9 Apr 2012 22:12:58 +0000 (15:12 -0700)]
Merge "resolved conflicts for merge of
a86fcc29 to master"
Kenny Root [Sun, 8 Apr 2012 17:42:34 +0000 (10:42 -0700)]
resolved conflicts for merge of
a86fcc29 to master
Change-Id: I3868c19bfd309b5b43b5642152a120931fe37315
Ying Wang [Mon, 9 Apr 2012 19:43:09 +0000 (12:43 -0700)]
Merge "Build system support to export include paths"
Nick Kralevich [Mon, 9 Apr 2012 19:30:12 +0000 (12:30 -0700)]
Merge "ARM: compile everything with relro / bind_now."
Doug Zongker [Mon, 9 Apr 2012 19:28:14 +0000 (12:28 -0700)]
Merge "fix broken OTAs; format() is called with wrong # of args"
Doug Zongker [Mon, 9 Apr 2012 19:27:43 +0000 (12:27 -0700)]
fix broken OTAs; format() is called with wrong # of args
Change-Id: Id95d345158b36f149c12342d6cd1f03f2875b110
Ying Wang [Mon, 9 Apr 2012 19:16:23 +0000 (12:16 -0700)]
Fix deps for notice generation.
With "foo bar : req", the build command will be run separately for foo
and bar.
Instead with "foo : bar" and "bar : req", the build command will be run
only once to produce both targets.
Also running the same build command concurrently may lead to build race
condition.
Change-Id: I8af2817546a7e2697a553c9320bd10f6bd4f20a2
Nick Kralevich [Tue, 20 Mar 2012 18:35:24 +0000 (11:35 -0700)]
ARM: compile everything with relro / bind_now.
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.
See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html
Stop using the custom linker script, which inhibits
relro / bind_now support.
Change-Id: Iaebfbbb492299004f9da92b649985b6cd67d8c97
Kenny Root [Sat, 7 Apr 2012 01:07:44 +0000 (18:07 -0700)]
am
026e219f: am
b22f6853: Merge changes I5a63fd61,I7c6f59fe
* commit '
026e219f780a1d257e78fe80419a10655dc615a8':
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
Kenny Root [Sat, 7 Apr 2012 01:06:09 +0000 (18:06 -0700)]
am
b22f6853: Merge changes I5a63fd61,I7c6f59fe
* commit '
b22f6853d9e6dd45491a20e31a63beda6c0f3717':
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
Kenny Root [Fri, 6 Apr 2012 21:42:41 +0000 (14:42 -0700)]
Merge changes I5a63fd61,I7c6f59fe
* changes:
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
Nick Sanders [Fri, 6 Apr 2012 21:11:10 +0000 (14:11 -0700)]
am
df49771a: Allow factory specific kernel commandline
* commit '
df49771a4a82a147e287190f872ab9d0e237a69f':
Allow factory specific kernel commandline
Stephen Smalley [Thu, 9 Feb 2012 18:36:21 +0000 (13:36 -0500)]
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.
Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24
Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
Stephen Smalley [Fri, 13 Jan 2012 13:12:31 +0000 (08:12 -0500)]
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
This configuration is used to determine the file security contexts
to set on the files in the yaffs2 or ext4 image that is generated.
This is similar to the android_filesystem_config.h tables for determining
the UID/GID/mode, but as a configuration rather than code.
Change-Id: I7c6f59fe7cb8bc4c86c8790f991b12dd93a61f68
Iliyan Malchev [Thu, 5 Apr 2012 23:11:15 +0000 (16:11 -0700)]
init.vbox_x86.rc: mount data & cache partitions from /dev/sdb
Change-Id: Ifa14f0be875848297883d2ee66372a355a4174e6
Signed-off-by: Iliyan Malchev <malchev@google.com>
Nick Sanders [Fri, 6 Apr 2012 01:30:02 +0000 (18:30 -0700)]
Allow factory specific kernel commandline
* BOARD_KERNEL_CMDLINE_FACTORY_BOOT can be set to
add kernel commandline items to the factory ramdisk,
such as fiq_debugger.console_enable=Y
Change-Id: Iee4060b96eaeecc517975c56342fd5445b1feabf
Signed-off-by: Nick Sanders <nsanders@google.com>
Eino-Ville Talvala [Fri, 6 Apr 2012 00:09:18 +0000 (17:09 -0700)]
Add new camera system include path to pathmap.
Change-Id: Ia4200dbffa90397a8a48d00139647c45646af734
Iliyan Malchev [Wed, 4 Apr 2012 22:57:20 +0000 (15:57 -0700)]
Merge "vbox_x86: update init.vbox_x86.rc, remove custom init.rc"
Iliyan Malchev [Tue, 3 Apr 2012 20:06:15 +0000 (13:06 -0700)]
vbox_x86: update init.vbox_x86.rc, remove custom init.rc
-- remove local copy of init.rc (start using system/core/rootdir/init.rc)
-- sync init.vbox_x86.rc with init.goldfish.rc (at SHA
a503456526359767ffb383a06835308f62172dde)
-- Make the following changes:
a) add mount calls
b) remove call to init.goldfish.sh
c) enable service netcfg
-- inherit frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk
Change-Id: Ic5f6b2da32dc79de85f3d7b93dffb483e480e098
Signed-off-by: Iliyan Malchev <malchev@google.com>
Roman Nurik [Wed, 4 Apr 2012 21:56:35 +0000 (14:56 -0700)]
am
31fc69c2: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
31fc69c218a6fb46c43a650cc0530e12853066bb':
Dima Zavin [Wed, 4 Apr 2012 19:17:17 +0000 (12:17 -0700)]
Merge "target/product: have the sdk product pull in the apns"
Roman Nurik [Wed, 4 Apr 2012 18:02:35 +0000 (11:02 -0700)]
am
67af236d: am
c403055b: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
67af236dc582e6350a3bf06ce78d5b21791b1a0a':
Roman Nurik [Wed, 4 Apr 2012 18:00:33 +0000 (11:00 -0700)]
am
5b250fbc: am
dceeaac8: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
5b250fbc433ff9143bf5717f636b0cbb8187bd35':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:58:50 +0000 (10:58 -0700)]
am
c403055b: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
c403055b10331e717fbe2420f4b92ce99e30e3f2':
Roman Nurik [Wed, 4 Apr 2012 17:58:16 +0000 (10:58 -0700)]
am
dceeaac8: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
dceeaac8bf6e4b71885a1468a32ffad1324d0022':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:55:53 +0000 (10:55 -0700)]
am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
51c9e67ec01d37bb67881ef06b7f38d4da36e945':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:55:47 +0000 (10:55 -0700)]
am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
51c9e67ec01d37bb67881ef06b7f38d4da36e945':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:55:35 +0000 (10:55 -0700)]
am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
51c9e67ec01d37bb67881ef06b7f38d4da36e945':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:53:51 +0000 (10:53 -0700)]
Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
Stephen Hines [Wed, 4 Apr 2012 15:02:49 +0000 (08:02 -0700)]
Merge "Add support for building with AddressSanitizer."
Stephen Hines [Wed, 4 Apr 2012 15:02:43 +0000 (08:02 -0700)]
Merge "Include Clang headers from ".../include" directory."
Dima Zavin [Wed, 4 Apr 2012 03:19:20 +0000 (20:19 -0700)]
target/product: have the sdk product pull in the apns
Bug:
6274210
Change-Id: I23c76975312a7fb60926853cdbde8065ae8b5f76
Signed-off-by: Dima Zavin <dima@android.com>
Scott Main [Wed, 4 Apr 2012 01:11:22 +0000 (18:11 -0700)]
am
ae9784cc: am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
ae9784cc50286542b406d14623d0ac059b994532':
Eric Laurent [Thu, 22 Mar 2012 18:17:24 +0000 (11:17 -0700)]
added audio_policy.conf file
Change-Id: Icde73ce66208972914324d64927fef816aa68ca6
Scott Main [Tue, 3 Apr 2012 21:10:19 +0000 (14:10 -0700)]
am
b114e228: am
4221fdbd: am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
b114e228a685cbc41f29d6d1b9c0925aff062b96':
Scott Main [Tue, 3 Apr 2012 21:10:18 +0000 (14:10 -0700)]
am
ad921800: am
0af1d53e: am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
ad92180046266eb0cbf0ea76b769e68caef5e778':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.