OSDN Git Service
Eric Fischer [Mon, 20 Jun 2011 19:02:46 +0000 (12:02 -0700)]
Merge "Expand the full languages list to include the new locales."
Ying Wang [Mon, 20 Jun 2011 18:05:27 +0000 (11:05 -0700)]
Merge "Uniq the system properties."
Ying Wang [Sat, 18 Jun 2011 00:44:08 +0000 (17:44 -0700)]
Fix tab.
The tab broke unbundled targets.
Change-Id: Ia97d4bdd69f7bb48eb3c51a01f0ab7085b5949a0
Eric Fischer [Fri, 17 Jun 2011 23:48:37 +0000 (16:48 -0700)]
Expand the full languages list to include the new locales.
Change-Id: I20ee5547109d6fd70a00d5661f7242f37e17bde5
Ryo Fujii [Sat, 18 Jun 2011 00:25:04 +0000 (17:25 -0700)]
Merge "fix broken build rules for host VM."
Ying Wang [Sat, 18 Jun 2011 00:05:35 +0000 (17:05 -0700)]
Uniq the system properties.
If multiple items with the same key appear in a config variable,
only the first item is taken.
Change-Id: Icf57befafb36ec35dd4d48c8c3ec595f353f68e7
Eric Laurent [Fri, 17 Jun 2011 03:53:25 +0000 (20:53 -0700)]
created speex resampler library
Change-Id: I4424cb40416d94ccf4637fbbb53f02d595c31e3d
Ryo Fujii [Thu, 16 Jun 2011 23:58:11 +0000 (16:58 -0700)]
fix broken build rules for host VM.
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:33:23 +0000 (08:33 -0700)]
am
ff67ed65: am
5e2e09c5: (-s ours) am
ee803184: am
f771489d: Merge "Tweak prelink map, more"
* commit '
ff67ed65b8d22c54b1907f2df9a690d580a9ef7b':
Tweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:24:53 +0000 (08:24 -0700)]
am
5e2e09c5: (-s ours) am
ee803184: am
f771489d: Merge "Tweak prelink map, more"
* commit '
5e2e09c569092dcc19f9646060cc1c33266eb213':
Tweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:04:31 +0000 (08:04 -0700)]
am
ee803184: am
f771489d: Merge "Tweak prelink map, more"
* commit '
ee8031843e4dc3e9ff60c1acdc516121145fece1':
Tweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:57:22 +0000 (07:57 -0700)]
am
f771489d: Merge "Tweak prelink map, more"
* commit '
f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
Tweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:43:02 +0000 (07:43 -0700)]
Merge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:33:52 +0000 (07:33 -0700)]
Tweak prelink map, more
Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:31:59 +0000 (20:31 -0700)]
am
3305a5af: am
84891367: am
9bd85361: am
15ced7e1: Merge prelink map tweaks
* commit '
3305a5af5398c66a074d2e329ac093f288e692f5':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:29:36 +0000 (20:29 -0700)]
am
84891367: am
9bd85361: am
15ced7e1: Merge prelink map tweaks
* commit '
8489136766b282d95f6e447a5ff4d63fbdbe8409':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:25:43 +0000 (20:25 -0700)]
am
9bd85361: am
15ced7e1: Merge prelink map tweaks
* commit '
9bd853612a45753512b3dab27f247adb46e7a3c8':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:22:36 +0000 (20:22 -0700)]
am
15ced7e1: Merge prelink map tweaks
* commit '
15ced7e137017befbae5bdde3b7ff60a27d897d4':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:17:28 +0000 (20:17 -0700)]
Merge prelink map tweaks
Change-Id: I86f101e250e53beb197f9ea46e7dfb7e44f20063
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map
Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25
Jean-Baptiste Queru [Fri, 17 Jun 2011 02:06:48 +0000 (19:06 -0700)]
am
27c9c6f6: am
9f2e07d2: am
69ae44e2: am
fd64de9a: Merge prelink map tweaks
* commit '
27c9c6f6fea63f7fbeceacae4c0576cc2b343bac':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 02:03:52 +0000 (19:03 -0700)]
am
9f2e07d2: am
69ae44e2: am
fd64de9a: Merge prelink map tweaks
* commit '
9f2e07d2c2147572edb7170206ba7ece6d42fcb5':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:58:18 +0000 (18:58 -0700)]
am
69ae44e2: am
fd64de9a: Merge prelink map tweaks
* commit '
69ae44e284b1735928b8db53bf2e0690768e2d1b':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:52:34 +0000 (18:52 -0700)]
am
fd64de9a: Merge prelink map tweaks
* commit '
fd64de9ae410b6bfe024971bd543d42286d2990f':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:37:07 +0000 (18:37 -0700)]
Merge prelink map tweaks
Change-Id: I11895037a7c5768f48f18b63274daaa4d25bc681
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map
Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:55:42 +0000 (17:55 -0700)]
am
9a708f4e: am
2ba042f9: (-s ours) am
40dc95be: am
14273125: Merge "Tweak prelink map"
* commit '
9a708f4eeb586d0a0087c6ed08e3287dae304f43':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:50:29 +0000 (17:50 -0700)]
am
2ba042f9: (-s ours) am
40dc95be: am
14273125: Merge "Tweak prelink map"
* commit '
2ba042f9d86c7715cbca07e0fd417d8cf9496846':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:32:11 +0000 (17:32 -0700)]
am
40dc95be: am
14273125: Merge "Tweak prelink map"
* commit '
40dc95be7744871b5363ae2e21a14343cd666b0f':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:09:14 +0000 (17:09 -0700)]
am
14273125: Merge "Tweak prelink map"
* commit '
142731256afc708f4ec07247bffbe733dcaed0f4':
Tweak prelink map
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:31:58 +0000 (16:31 -0700)]
Merge "Tweak prelink map"
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:17:42 +0000 (16:17 -0700)]
Tweak prelink map
Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:14:24 +0000 (14:14 -0700)]
am
4c60b305: (-s ours) am
70a89584: Merge
742968bd
* commit '
4c60b30542a674d6375d2cccbe90161b34e62e5a':
Adding a cleanspec to pick up version change. Do not merge.
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:12:18 +0000 (14:12 -0700)]
am
70a89584: Merge
742968bd
* commit '
70a895846d9a9fdddd9d224e32959a53f9d3c97e':
Adding a cleanspec to pick up version change. Do not merge.
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:06:55 +0000 (14:06 -0700)]
Merge
742968bd
Change-Id: I90a9f487a8b6d9bc96dedbe9f1e978e439be8cd3
Dan Morrill [Thu, 16 Jun 2011 20:43:50 +0000 (13:43 -0700)]
Adding a cleanspec to pick up version change. Do not merge.
Change-Id: I4853ae86488164400d7a0203614b9e87515f6e61
Ed Heyl [Thu, 16 Jun 2011 20:26:15 +0000 (13:26 -0700)]
am
44fc3c66: (-s ours) am
cedbd2f5: (-s ours) am
eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
* commit '
44fc3c665d5709dfd3a89208892edd2b94387e5c':
add ANDROID_HOST_OUT to env (please do not merge)
Jean-Baptiste Queru [Thu, 16 Jun 2011 20:25:31 +0000 (13:25 -0700)]
am
13c7c023: (-s ours) am
eb9fc27d: am
4c90a648: am
14bf45f3: Merge "Switch back to mksh as the default"
* commit '
13c7c0234d4e484cc72138424a61d0f8e85eb712':
Switch back to mksh as the default
Ed Heyl [Thu, 16 Jun 2011 20:19:42 +0000 (13:19 -0700)]
am
cedbd2f5: (-s ours) am
eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
* commit '
cedbd2f587f894647ab5bf3bdd200ee78c673881':
add ANDROID_HOST_OUT to env (please do not merge)
Ed Heyl [Thu, 16 Jun 2011 20:17:08 +0000 (13:17 -0700)]
am
eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
* commit '
eb27aa01c87ed774cf5d71ce1c92d87575a08ad7':
add ANDROID_HOST_OUT to env (please do not merge)
Jean-Baptiste Queru [Thu, 16 Jun 2011 20:09:12 +0000 (13:09 -0700)]
am
eb9fc27d: am
4c90a648: am
14bf45f3: Merge "Switch back to mksh as the default"
* commit '
eb9fc27dbe062248167981d2a4f1aa9e058a2313':
Switch back to mksh as the default
Ed Heyl [Thu, 16 Jun 2011 20:08:09 +0000 (13:08 -0700)]
Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
Jean-Baptiste Queru [Thu, 16 Jun 2011 19:57:33 +0000 (12:57 -0700)]
am
4c90a648: am
14bf45f3: Merge "Switch back to mksh as the default"
* commit '
4c90a648cd0e1310d4b934c54905af3cf40b2770':
Switch back to mksh as the default
Jean-Baptiste Queru [Thu, 16 Jun 2011 19:43:14 +0000 (12:43 -0700)]
Jean-Baptiste Queru [Thu, 16 Jun 2011 18:39:18 +0000 (11:39 -0700)]
am
14bf45f3: Merge "Switch back to mksh as the default"
* commit '
14bf45f31d99cdaa5cc0c46efa3f2c2724704173':
Switch back to mksh as the default
Jean-Baptiste Queru [Thu, 16 Jun 2011 17:53:27 +0000 (10:53 -0700)]
Merge "Switch back to mksh as the default"
The Android Open Source Project [Thu, 16 Jun 2011 17:32:45 +0000 (10:32 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I38cd7acff7e6fd4789335170ec8bd91fe4853f4d
Jean-Baptiste Queru [Thu, 16 Jun 2011 16:25:58 +0000 (09:25 -0700)]
Switch back to mksh as the default
Change-Id: I4f39e8d8cc22520cd36f83f8675a716cc1ade1d9
The Android Automerger [Thu, 16 Jun 2011 15:57:43 +0000 (08:57 -0700)]
HLJ77
Change-Id: I8d769731e3533e0a7be54333ec28f028baf232c4
The Android Automerger [Thu, 16 Jun 2011 15:57:05 +0000 (08:57 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jean-Baptiste Queru [Thu, 16 Jun 2011 14:46:17 +0000 (07:46 -0700)]
Jean-Baptiste Queru [Thu, 16 Jun 2011 14:19:44 +0000 (07:19 -0700)]
Merge
bb41d06d
Change-Id: Ieeeec2e835e3e7eb223a5f62927111db24295ccf
The Android Automerger [Thu, 16 Jun 2011 06:02:51 +0000 (23:02 -0700)]
HTJ76B
Change-Id: Ib7926f3add431484d3071e9539c95f4c8e015d19
The Android Automerger [Thu, 16 Jun 2011 06:02:45 +0000 (23:02 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 15 Jun 2011 22:20:01 +0000 (15:20 -0700)]
HTJ76
Change-Id: I9ec04b52382dda4e0ac50864c1ad3f927c4da5b5
The Android Automerger [Wed, 15 Jun 2011 22:19:53 +0000 (15:19 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
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: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
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: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
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: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: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
Dan Morrill [Thu, 9 Jun 2011 20:20:55 +0000 (13:20 -0700)]
Update version to 2.3.5.
Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
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: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
OSDN Git Service
