OSDN Git Service
Conley Owens [Tue, 2 Oct 2012 23:06:41 +0000 (16:06 -0700)]
Merge "Follow symlinks when using find"
Conley Owens [Tue, 2 Oct 2012 17:32:00 +0000 (10:32 -0700)]
Follow symlinks when using find
This allows more flexibility with symlinking subtrees within projects.
For example, a build bot with a read-only copy of the src can copy
directories which will be affected by applied patches while symlinking
to directories that will remain untouched.
Change-Id: I9c783180f3ebdd737d8daf17550f562e4f00b200
Andrew Hsieh [Wed, 12 Sep 2012 20:44:00 +0000 (13:44 -0700)]
Merge "Enable stack-protector for x86"
Ying Wang [Tue, 11 Sep 2012 18:49:11 +0000 (11:49 -0700)]
Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
Ying Wang [Tue, 21 Aug 2012 18:54:49 +0000 (11:54 -0700)]
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Bug:
7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
Ying Wang [Mon, 10 Sep 2012 16:48:26 +0000 (09:48 -0700)]
Merge "Add transform-d-to-p-args"
Ying Wang [Sat, 8 Sep 2012 00:04:06 +0000 (17:04 -0700)]
Add transform-d-to-p-args
This new indirection allows us too to output .P files when we are
generating non-.o files, such as .s or .S files.
Bug:
7127743
Change-Id: I9e46c417031764fefc9909ba4a3eb63885f34f9e
Ying Wang [Thu, 6 Sep 2012 17:36:30 +0000 (10:36 -0700)]
Merge "Clean step for libc."
Ying Wang [Wed, 5 Sep 2012 22:58:29 +0000 (15:58 -0700)]
Clean step for libc.
(cherry-pick of
ab1e93d4d4f4a46fa922df5ba7ccd41dde1221ac.)
Change-Id: I304312d6eb0346c050d02bd834565e0d43d8b4dd
Ying Wang [Thu, 6 Sep 2012 01:15:11 +0000 (18:15 -0700)]
Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
Ying Wang [Thu, 6 Sep 2012 01:08:29 +0000 (18:08 -0700)]
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Before setting up the rules.
Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
Conley Owens [Tue, 4 Sep 2012 17:24:54 +0000 (10:24 -0700)]
Merge "Follow symlinks in findleaves"
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:01:29 +0000 (11:01 -0700)]
Merge "Add make_ext4fs to support installing apps to SD card"
Jun Tian [Thu, 30 Aug 2012 02:59:17 +0000 (10:59 +0800)]
Add make_ext4fs to support installing apps to SD card
The default createSecureContainer format is changed from fat32 to ext4 in PackageHelper::CreateSdDir in:
/frameworks/base/core/java/com/android/internal/content/PackageHelper.java
We need to add make_ext4fs into the system image to support installing apps to SD card.
In kernel, we also need to add ext4 filesystem support.
Change-Id: If4817a95663144a6bfaeeed0c7cb081063a0daad
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
Andrew Hsieh [Wed, 29 Aug 2012 07:13:23 +0000 (15:13 +0800)]
Enable stack-protector for x86
Change-Id: I7a169075ca49ab831c37625d416c1d4b026bfec3
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:47:34 +0000 (12:47 -0700)]
Merge "Add pattern to check for GCC 4.6"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:46:43 +0000 (12:46 -0700)]
Merge "Include all standard shared library paths in /system/lib"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:27:20 +0000 (12:27 -0700)]
Merge "Use gold linker on x86"
Pavel Chupin [Tue, 28 Aug 2012 08:20:55 +0000 (12:20 +0400)]
Use gold linker on x86
Patch removes fallback -fuse-ld=bfd for x86 target and
--copy-dt-needed-entries which is not supported by gold linker.
Change-Id: Ie5603f98e3f2f9d4f81678c718e39b130a75d057
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Andrew Hsieh [Tue, 28 Aug 2012 02:49:05 +0000 (10:49 +0800)]
Add pattern to check for GCC 4.6
GCC 4.6 --version can return 4.6.x-google but also simply 4.6
as of https://android-review.googlesource.com/#/c/42028.
Add more pattern to detect it.
Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
Chris Dearman [Thu, 2 Feb 2012 22:16:52 +0000 (14:16 -0800)]
Include all standard shared library paths in /system/lib
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ib33ce42532cc8cedc6f48036a257a2a225c82a69
Conley Owens [Fri, 24 Aug 2012 23:24:45 +0000 (16:24 -0700)]
Follow symlinks in findleaves
If we replace the project directories with symlinks to the actual
directories, everything should build fine. Unfortunately, without
this fix, it does not.
Change-Id: Id19fef9696d0f599a7b3a14b6a8fc10ae857f9c7
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:00:10 +0000 (13:00 -0700)]
Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:52:40 +0000 (14:52 -0700)]
Merge "Fix reporting wrong error message for zipalign output file"
Jean-Baptiste Queru [Wed, 22 Aug 2012 16:44:48 +0000 (09:44 -0700)]
Merge "Build on Mac OS X : add experimental SDK versions"
SangWook Han [Mon, 30 Jul 2012 17:09:38 +0000 (02:09 +0900)]
Build on Mac OS X : add experimental SDK versions
Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
Andrew Hsieh [Tue, 21 Aug 2012 17:21:54 +0000 (10:21 -0700)]
Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
Ard Biesheuvel [Tue, 21 Aug 2012 08:42:32 +0000 (10:42 +0200)]
ARM: put crtbegin_so.o at the beginning where it belongs
Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
Andrew Hsieh [Tue, 21 Aug 2012 06:40:16 +0000 (14:40 +0800)]
Added BUILD_HOST_static to build statically linked executable/shared-lib
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.
In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread
Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
Jingwen Owen Ou [Fri, 17 Aug 2012 23:21:11 +0000 (16:21 -0700)]
Fix reporting wrong error message for zipalign output file
The problem is due to using variable inFileName instead of outFileName for printing out error message for output file.
Change-Id: Ie53a21b077fea5e7cd106fe6884cea159d2629a2
Joe Onorato [Fri, 17 Aug 2012 12:36:20 +0000 (05:36 -0700)]
Merge "Install all host modules. Don't filter out ones tagged "optional""
Joe Onorato [Fri, 17 Aug 2012 12:33:39 +0000 (05:33 -0700)]
Install all host modules. Don't filter out ones tagged "optional"
Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
Joe Onorato [Fri, 17 Aug 2012 11:20:37 +0000 (04:20 -0700)]
Merge "Add all the host tools to the list of prerequisites for the SDK."
Joe Onorato [Fri, 17 Aug 2012 11:19:38 +0000 (04:19 -0700)]
Add all the host tools to the list of prerequisites for the SDK.
Change-Id: I3a3e4be8796f761119e29f3be64ad534e48c95ee
Joe Onorato [Fri, 17 Aug 2012 08:13:00 +0000 (01:13 -0700)]
Merge "Another error to warning"
Joe Onorato [Fri, 17 Aug 2012 08:12:27 +0000 (01:12 -0700)]
Another error to warning
Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
Joe Onorato [Fri, 17 Aug 2012 07:36:44 +0000 (00:36 -0700)]
Merge "Make error a warning for now"
Joe Onorato [Fri, 17 Aug 2012 07:35:09 +0000 (00:35 -0700)]
Make error a warning for now
Change-Id: Idf18957fff2bb4ff31ca6d7d8d1c8d95847b4e00
Joe Onorato [Fri, 17 Aug 2012 06:37:45 +0000 (23:37 -0700)]
Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87
* changes:
Move the old user tagged modules over to base.mk so mini and core both share them.
More product debugging.
build system changes for jb-aah-dev merge
Fail when a non-vendor product references a vendor module.
Remove support for user tags in the build system.
List the user modules explicitly, and we can get rid of the support for the user tag!
Dump the user tagged modules.
host modules don't need LOCAL_MODULE_TAGS
Don't give the user tag to host modules automatically.
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Add tool to parse make dependency info from new --deps flag.
Use a more modern -j flag.
make product-graph now filtered
Joe Onorato [Tue, 24 Jul 2012 01:20:07 +0000 (18:20 -0700)]
Move the old user tagged modules over to base.mk so mini and core both share them.
Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
Joe Onorato [Mon, 23 Jul 2012 20:51:44 +0000 (13:51 -0700)]
More product debugging.
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
Joe Onorato [Thu, 12 Jul 2012 02:38:48 +0000 (19:38 -0700)]
build system changes for jb-aah-dev merge
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
Joe Onorato [Wed, 23 May 2012 00:33:22 +0000 (17:33 -0700)]
Fail when a non-vendor product references a vendor module.
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
Joe Onorato [Tue, 22 May 2012 21:08:50 +0000 (14:08 -0700)]
Remove support for user tags in the build system.
It is not forbidden to say LOCAL_MODULE_TAGS := user,
and if you don't say LOCAL_MODULE_TAGS, it now defaults
to optional.
Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
Joe Onorato [Tue, 22 May 2012 19:20:27 +0000 (12:20 -0700)]
List the user modules explicitly, and we can get rid of the support for the user tag!
Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
Joe Onorato [Mon, 21 May 2012 19:16:05 +0000 (12:16 -0700)]
Dump the user tagged modules.
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
Joe Onorato [Sat, 19 May 2012 03:43:41 +0000 (20:43 -0700)]
host modules don't need LOCAL_MODULE_TAGS
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
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
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
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
Joe Onorato [Tue, 8 May 2012 02:21:51 +0000 (19:21 -0700)]
Use a more modern -j flag.
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
Joe Onorato [Tue, 8 May 2012 00:15:15 +0000 (17:15 -0700)]
make product-graph now filtered
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:55:25 +0000 (14:55 -0700)]
Merge "select.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>
Elliott Hughes [Thu, 16 Aug 2012 02:43:40 +0000 (19:43 -0700)]
Merge "The 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
Jean-Baptiste Queru [Tue, 14 Aug 2012 17:51:21 +0000 (10:51 -0700)]
Merge "Set 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
Ying Wang [Mon, 13 Aug 2012 22:41:12 +0000 (15:41 -0700)]
Merge "Move 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
Ying Wang [Mon, 13 Aug 2012 21:52:24 +0000 (14:52 -0700)]
Merge "Add mac_permissions.xml dependency."
Elliott Hughes [Sat, 11 Aug 2012 16:34:51 +0000 (09:34 -0700)]
Merge "Remove 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
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:16:20 +0000 (09:16 -0700)]
Merge "MIPS 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>
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:33 +0000 (08:39 -0700)]
Merge "Support for MIPS Build targets."
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"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:18 +0000 (13:40 -0700)]
Merge "x86: cleanups for toolchain"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:18:56 +0000 (13:18 -0700)]
Merge "definitions.mk: Don't use GCC '@' parameter"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:56 +0000 (12:58 -0700)]
Merge "core/Makefile: also look for device/*/build/tasks"
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>
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>
Elliott Hughes [Fri, 27 Jul 2012 21:14:57 +0000 (14:14 -0700)]
Merge "Now 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
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:05:22 +0000 (10:05 -0700)]
Merge "Fix 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
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>
Joe Onorato [Thu, 26 Jul 2012 00:56:24 +0000 (17:56 -0700)]
Joe Onorato [Thu, 26 Jul 2012 00:55:03 +0000 (17:55 -0700)]
Should have been included in
74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
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."
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
Andrew Hsieh [Wed, 25 Jul 2012 20:40:30 +0000 (13:40 -0700)]
Merge "Add -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
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
Nick Kralevich [Wed, 18 Jul 2012 20:55:09 +0000 (13:55 -0700)]
Merge "Add property_contexts to SELINUX_DEPENDS."
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>
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
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>
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
The Android Open Source Project [Wed, 4 Jul 2012 23:48:36 +0000 (16:48 -0700)]
Reconcile with jb-release
Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da
The Android Automerger [Wed, 4 Jul 2012 20:53:25 +0000 (13:53 -0700)]
JRO03C
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
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
The Android Open Source Project [Tue, 3 Jul 2012 21:09:18 +0000 (14:09 -0700)]
Reconcile with jb-release
Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec
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
Jean-Baptiste Queru [Tue, 3 Jul 2012 21:04:28 +0000 (14:04 -0700)]
Ignore version change from jb-dev
Change-Id: Ia04c4664cba4abdef04f0949713f4c76281713d8
The Android Automerger [Tue, 3 Jul 2012 21:00:39 +0000 (14:00 -0700)]
JRO03B
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
Ed Heyl [Tue, 3 Jul 2012 20:57:52 +0000 (13:57 -0700)]
Merge "4.1.1" into jb-dev
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5