OSDN Git Service
The Android Automerger [Fri, 17 Jun 2011 21:27:59 +0000 (14:27 -0700)]
IRJ78
Change-Id: I66df4b8aa35797c4a15fec0bb2307f28844cc6b7
The Android Automerger [Fri, 17 Jun 2011 15:52:42 +0000 (08:52 -0700)]
IRJ77D
Change-Id: I36403d6221a844c575cb5e74b70e45f05501d307
The Android Automerger [Fri, 17 Jun 2011 13:40:36 +0000 (06:40 -0700)]
IRJ77C
Change-Id: I2016d162a88f637d06f83411e915a987d9bc2e25
The Android Automerger [Thu, 16 Jun 2011 21:32:58 +0000 (14:32 -0700)]
IRJ77B
Change-Id: I9b0dd4a1c18adc4854922feed0eb6bd6ef5278db
The Android Automerger [Thu, 16 Jun 2011 15:46:13 +0000 (08:46 -0700)]
IRJ77
Change-Id: I810f15c8ee53a1270807cf3ebd4d9777ea8d4c6c
The Android Automerger [Thu, 16 Jun 2011 15:46:06 +0000 (08:46 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 15 Jun 2011 22:14:56 +0000 (15:14 -0700)]
IRJ76B
Change-Id: Ic0b4c22bd8bc65c17162cae816d807e7164e130f
The Android Open Source Project [Wed, 15 Jun 2011 22:09:39 +0000 (15:09 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I865fe646706016836a842a75057bc79b3989ac89
The Android Automerger [Wed, 15 Jun 2011 13:44:21 +0000 (06:44 -0700)]
IRJ76
Change-Id: I6b3b0ac7ce534378cb172af370fd37f1f5103ce2
The Android Automerger [Wed, 15 Jun 2011 13:44:13 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 15 Jun 2011 13:13:44 +0000 (06:13 -0700)]
HLJ76
Change-Id: Ia1fc20871a8b7c0093cdb94df8cd97e4cd7dfe40
The Android Automerger [Wed, 15 Jun 2011 13:13:27 +0000 (06:13 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 14 Jun 2011 23:49:19 +0000 (16:49 -0700)]
HTJ75
Change-Id: I30acf132246efd577b50464be65af8b5a7a34e81
The Android Automerger [Tue, 14 Jun 2011 23:49:14 +0000 (16:49 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 14 Jun 2011 18:34:56 +0000 (11:34 -0700)]
IRJ75B
Change-Id: I1d4ce650453b36a0990b662074236d69631ec811
Gloria Wang [Tue, 14 Jun 2011 17:38:21 +0000 (10:38 -0700)]
Enable Forward Lock DRM plugin.
Change-Id: Ida8694bad0b68e1941e00145b85fabb42d92fd72
The Android Automerger [Tue, 14 Jun 2011 13:40:49 +0000 (06:40 -0700)]
IRJ75
Change-Id: I823491e03822ea74da1800d84eaf11b18d23a901
The Android Automerger [Tue, 14 Jun 2011 13:40:41 +0000 (06:40 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 14 Jun 2011 13:12:05 +0000 (06:12 -0700)]
HLJ75
Change-Id: I42a8af65dc5225b8824552010f4ceff13ccc2a2f
The Android Automerger [Tue, 14 Jun 2011 13:12:00 +0000 (06:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 14 Jun 2011 03:53:22 +0000 (20:53 -0700)]
IRJ74B
Change-Id: Ied3b614643df994d5657a25c0a6c23f65081b150
Ying Wang [Tue, 14 Jun 2011 00:36:08 +0000 (17:36 -0700)]
Use TARGET_BOARD_INFO_FILE to locate board-info.txt
So board-info.txt can be inherited from the parent device.
Change-Id: I5d99a2483b9a325e475f3c602d9e0f5d2b95e80c
The Android Automerger [Mon, 13 Jun 2011 21:39:56 +0000 (14:39 -0700)]
HTJ74
Change-Id: I140395c208581dd63cefca52c1cc1bad13c017e1
The Android Automerger [Mon, 13 Jun 2011 21:39:51 +0000 (14:39 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Open Source Project [Mon, 13 Jun 2011 20:52:54 +0000 (13:52 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I420737faef935997dfb149805ab7f9ba45a3d9db
Jean-Baptiste Queru [Mon, 13 Jun 2011 17:19:23 +0000 (10:19 -0700)]
Merge "Add DRM libraries"
The Android Automerger [Mon, 13 Jun 2011 13:44:26 +0000 (06:44 -0700)]
IRJ74
Change-Id: I0e29278f1d7a550a17e5724d4cfaf2eb430a71ca
The Android Automerger [Mon, 13 Jun 2011 13:44:17 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Mon, 13 Jun 2011 13:12:47 +0000 (06:12 -0700)]
HLJ74
Change-Id: I8232fc1cf252df8ddca19c939979411559b349cd
The Android Automerger [Mon, 13 Jun 2011 13:12:34 +0000 (06:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open Source Project [Fri, 10 Jun 2011 22:42:37 +0000 (15:42 -0700)]
Reconcile with gingerbread-release
Change-Id: Ib78aa2a68601dace481a67c2c310fe8f9d170c5c
Jean-Baptiste Queru [Fri, 10 Jun 2011 22:13:46 +0000 (15:13 -0700)]
Add DRM libraries
They're used in all products
Change-Id: I125e693df2ec012ca3e5461ba9ada8c21c529ef7
android-merger [Fri, 10 Jun 2011 22:04:31 +0000 (15:04 -0700)]
GRJ71B
Change-Id: I7cc782c78cf18df07949011ef9427063cafa3c94
The Android Automerger [Fri, 10 Jun 2011 21:57:26 +0000 (14:57 -0700)]
GRJ71
Change-Id: I7d5674396d8792e21cc3b39532abf895b48f46a0
The Android Automerger [Fri, 10 Jun 2011 21:57:20 +0000 (14:57 -0700)]
merge in gingerbread-release history after reset to gingerbread
Jean-Baptiste Queru [Fri, 10 Jun 2011 21:27:08 +0000 (14:27 -0700)]
Merge "Remove photo and video editors from full builds"
The Android Open Source Project [Fri, 10 Jun 2011 21:23:34 +0000 (14:23 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I3a2411dbab421bbf1d007c73ec729b4ca58dba48
Jean-Baptiste Queru [Fri, 10 Jun 2011 21:22:27 +0000 (14:22 -0700)]
Remove photo and video editors from full builds
Change-Id: I5541fee3cd28a550945414510bc1e8141bc818fd
Dianne Hackborn [Fri, 10 Jun 2011 21:00:55 +0000 (14:00 -0700)]
resolved conflicts for merge of
3f72af13 to master
Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
Dianne Hackborn [Fri, 10 Jun 2011 14:29:22 +0000 (07:29 -0700)]
Merge
cb5b6d16
Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
The Android Automerger [Fri, 10 Jun 2011 13:43:37 +0000 (06:43 -0700)]
IRJ71
Change-Id: I1145913ad614402a2258fe110ff5894aabe23c00
The Android Automerger [Fri, 10 Jun 2011 13:43:29 +0000 (06:43 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Fri, 10 Jun 2011 13:13:03 +0000 (06:13 -0700)]
HLJ71
Change-Id: If0e8a5253c93b20ffecc95e9270eebabf7e12a7e
The Android Automerger [Fri, 10 Jun 2011 13:12:57 +0000 (06:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 10 Jun 2011 00:43:30 +0000 (17:43 -0700)]
HTJ70C
Change-Id: Ic3c9b56e449fe6cf2e29b6fe07020f777311e98b
The Android Automerger [Fri, 10 Jun 2011 00:43:25 +0000 (17:43 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Dianne Hackborn [Fri, 10 Jun 2011 00:25:43 +0000 (17:25 -0700)]
am
0b22d93b: Welcome, Android 3.2.
* commit '
0b22d93be32eeff06e6626ad766b040057b931a5':
Welcome, Android 3.2.
Dianne Hackborn [Thu, 9 Jun 2011 18:29:34 +0000 (11:29 -0700)]
Welcome, Android 3.2.
Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
Mike Lockwood [Thu, 9 Jun 2011 22:46:00 +0000 (15:46 -0700)]
Merge "Add support for products overriding properties in /default.prop"
The Android Automerger [Thu, 9 Jun 2011 22:26:08 +0000 (15:26 -0700)]
HTJ70B
Change-Id: Icd599536fb254861629e968461bc146c6fd0be7c
The Android Automerger [Thu, 9 Jun 2011 22:25:57 +0000 (15:25 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Jean-Baptiste Queru [Thu, 9 Jun 2011 22:00:56 +0000 (15:00 -0700)]
Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I3da699139b9c67b09c8076f3fdef0c7c115ffbcc
Mike Lockwood [Thu, 9 Jun 2011 21:54:40 +0000 (14:54 -0700)]
Add support for products overriding properties in /default.prop
We need this to allow products to specify the default USB configuration,
and allow the build system to add adb to this configuration
for eng and userdebug builds.
For example:
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
persist.sys.usb.config=mtp
Change-Id: I83d7d918e57a8117eb96919e17d8ad52afdc0388
Signed-off-by: Mike Lockwood <lockwood@android.com>
android-merger [Thu, 9 Jun 2011 20:55:16 +0000 (13:55 -0700)]
GRJ70B
Change-Id: I4142cfae1378d46c6ee9ae795bcf21af91039505
The Android Automerger [Thu, 9 Jun 2011 20:45:46 +0000 (13:45 -0700)]
GRJ70
Change-Id: If43e3bcca9e61825d1a7f3287b233d1e9f5e32ad
The Android Automerger [Thu, 9 Jun 2011 20:45:18 +0000 (13:45 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 9 Jun 2011 20:25:30 +0000 (13:25 -0700)]
IRJ70B
Change-Id: I7f24ed2f457c70f23bc30ab9f929c005c6be3de6
The Android Automerger [Thu, 9 Jun 2011 14:11:24 +0000 (07:11 -0700)]
HTJ70
Change-Id: I77af93ce68f43904414ecd92f39882f88f8f9c57
The Android Automerger [Thu, 9 Jun 2011 14:11:19 +0000 (07:11 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 9 Jun 2011 13:44:36 +0000 (06:44 -0700)]
IRJ70
Change-Id: I6c6a85cb4c6b7ecf1e5542f7ec2f79cbbedff0cd
The Android Automerger [Thu, 9 Jun 2011 13:44:29 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Thu, 9 Jun 2011 13:08:38 +0000 (06:08 -0700)]
HLJ70
Change-Id: I1894d3be0640212779cbeb7e57fea7c63d4af66b
The Android Automerger [Thu, 9 Jun 2011 13:08:28 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Mike Lockwood [Thu, 9 Jun 2011 02:11:02 +0000 (19:11 -0700)]
Merge "post_process_props: Write mangled properties back to file instead of stdout"
Mike Lockwood [Thu, 9 Jun 2011 02:06:43 +0000 (19:06 -0700)]
post_process_props: Write mangled properties back to file instead of stdout
Change-Id: I78b642400c46019165f12d409a238344ca6e09dd
Signed-off-by: Mike Lockwood <lockwood@android.com>
Chia-chi Yeh [Thu, 9 Jun 2011 01:57:37 +0000 (18:57 -0700)]
Merge "Add VpnDialogs for user space VPN."
The Android Automerger [Thu, 9 Jun 2011 01:02:10 +0000 (18:02 -0700)]
HLJ69B
Change-Id: I8f1c4a23fe95bf8ff505f302a96a05f265dee938
The Android Automerger [Thu, 9 Jun 2011 01:02:02 +0000 (18:02 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Joe Onorato [Wed, 8 Jun 2011 23:04:45 +0000 (16:04 -0700)]
Merge "post process the system properties"
Joe Onorato [Wed, 8 Jun 2011 23:04:14 +0000 (16:04 -0700)]
post process the system properties
Change-Id: Ib78fe238d90dd4523326e4fa088d9333edc9e299
The Android Automerger [Wed, 8 Jun 2011 22:47:26 +0000 (15:47 -0700)]
IRJ69B
Change-Id: I78c9d76670fa48b169c526c2120a98cb55bcca6a
Ed Heyl [Wed, 8 Jun 2011 18:02:27 +0000 (11:02 -0700)]
am
d23d0f07: (-s ours) am
ec664803: am
c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit '
d23d0f076465a2aaf86989de01cdcc686842499a':
add ANDROID_HOST_OUT to env (please do not merge)
Eino-Ville Talvala [Wed, 8 Jun 2011 17:27:25 +0000 (10:27 -0700)]
Merge "Ensure all filter framework libraries are included."
Jean-Baptiste Queru [Wed, 8 Jun 2011 15:09:02 +0000 (08:09 -0700)]
Reconcile with gingerbread-release
Change-Id: Iade0c3ecab1c6d6a0b8c3ab7381c60975393d9a1
The Android Automerger [Wed, 8 Jun 2011 14:10:18 +0000 (07:10 -0700)]
HTJ69
Change-Id: Ica8c8a4e09e1452ea10a6b00b817e1117013a30f
The Android Automerger [Wed, 8 Jun 2011 14:10:14 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 8 Jun 2011 13:44:10 +0000 (06:44 -0700)]
IRJ69
Change-Id: I1eb3de353d1ecc4cc16e2bcd1ffafd641833c027
The Android Automerger [Wed, 8 Jun 2011 13:44:03 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 8 Jun 2011 13:12:43 +0000 (06:12 -0700)]
HLJ69
Change-Id: I199c5f33514d99bbdbd70eddbfa767f99f850249
The Android Automerger [Wed, 8 Jun 2011 13:12:31 +0000 (06:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jean-Baptiste Queru [Wed, 8 Jun 2011 01:20:30 +0000 (18:20 -0700)]
am
f0d2a546: Merge
78e7f1f0
* commit '
f0d2a54669c8bf14e95482437e361c81dfb62404':
Increase the Java heap size for droiddoc
Jean-Baptiste Queru [Wed, 8 Jun 2011 01:20:28 +0000 (18:20 -0700)]
Jean-Baptiste Queru [Wed, 8 Jun 2011 01:20:25 +0000 (18:20 -0700)]
am
45a3ad7d: Merge
c1efb060
* commit '
45a3ad7d225495367a47440da118609b4940fe71':
Relax the constraint of 64bit build environment.
Ying Wang [Wed, 8 Jun 2011 00:16:24 +0000 (17:16 -0700)]
am
60d6ef91: am
1482d2db: am
e2419c89: Support to run dex-preopt on prebuilt apks.
* commit '
60d6ef91b6e1f7803fdf7869afba01cdf37f1b17':
Support to run dex-preopt on prebuilt apks.
The Android Automerger [Tue, 7 Jun 2011 22:30:11 +0000 (15:30 -0700)]
HTJ68B
Change-Id: I858c6b5c74be695de5d374eba0000161430b2fd0
The Android Automerger [Tue, 7 Jun 2011 22:30:05 +0000 (15:30 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Doug Kwan [Tue, 7 Jun 2011 22:09:19 +0000 (15:09 -0700)]
Add libgabi++. We need this for RTTI.
Change-Id: I0cae803b16babf84e7be2e80681d33469ce43964
Eino-Ville Talvala [Tue, 7 Jun 2011 22:04:38 +0000 (15:04 -0700)]
Ensure all filter framework libraries are included.
Change-Id: I48f75868b4082d2b47c451ffc7251dfa5b25e8c1
Ed Heyl [Tue, 7 Jun 2011 20:15:20 +0000 (13:15 -0700)]
am
ec664803: am
c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit '
ec6648036ef9e0d4fe25a4d4abbd79279d2ee9d0':
add ANDROID_HOST_OUT to env (please do not merge)
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:11:14 +0000 (13:11 -0700)]
Merge
78e7f1f0
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:10:15 +0000 (13:10 -0700)]
Merge
5adc2d05
Change-Id: I84a96fc4ca9db476e62959425f622fc88527e181
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:09:58 +0000 (13:09 -0700)]
Merge
c1efb060
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
Ed Heyl [Tue, 7 Jun 2011 19:55:39 +0000 (12:55 -0700)]
am
c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit '
c811f29198fc4862e22dbf233bc28210d14e0205':
add ANDROID_HOST_OUT to env (please do not merge)
Ed Heyl [Tue, 7 Jun 2011 19:02:51 +0000 (12:02 -0700)]
add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: I97e49fcb2610344df1907ec17116ee6e8a586e38
The Android Automerger [Tue, 7 Jun 2011 18:10:28 +0000 (11:10 -0700)]
IRJ68B
Change-Id: I28f7aeb9e9c29d82a6b40022bd1e14f0ef875faf
The Android Automerger [Tue, 7 Jun 2011 18:10:09 +0000 (11:10 -0700)]
merge in ics-release history after reset to master
Doug Kwan [Tue, 7 Jun 2011 17:55:48 +0000 (10:55 -0700)]
Allow per module RTTI setting. This fixes a bug in previous check-ins.
Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
Jean-Baptiste Queru [Tue, 7 Jun 2011 17:42:18 +0000 (10:42 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: Id467baa2d2c87f9cf16ca4fb66be3a8a9f50008d
Brian Carlstrom [Tue, 7 Jun 2011 17:30:30 +0000 (10:30 -0700)]
Merge "Add KeyChain to core product defintion since Browser depends on it"
Martijn Coenen [Tue, 7 Jun 2011 15:57:34 +0000 (08:57 -0700)]
Revert "x86: Enable -fstack-protector"
This reverts commit
e397dcccbb1bb2ed52b4d6febaee8fb900154b3e.
OSDN Git Service
