OSDN Git Service
Raphael Moll [Wed, 28 Mar 2012 00:55:43 +0000 (17:55 -0700)]
am
2696eb6d: am
3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '
2696eb6d11759e8a0cd839e9f10c90e38efea21a':
SDK atree: support HOST_OUT location.
Raphael Moll [Wed, 28 Mar 2012 00:53:32 +0000 (17:53 -0700)]
am
3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '
3b1ebe7dc291175886f21ffbbccdb98b560efabf':
SDK atree: support HOST_OUT location.
Raphael Moll [Tue, 27 Mar 2012 18:40:46 +0000 (11:40 -0700)]
Merge "SDK atree: support HOST_OUT location."
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:08:41 +0000 (08:08 -0700)]
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:07:09 +0000 (08:07 -0700)]
Jean-Baptiste Queru [Tue, 27 Mar 2012 14:37:56 +0000 (07:37 -0700)]
Merge "Fix build"
Glenn Kasten [Tue, 27 Mar 2012 02:15:25 +0000 (19:15 -0700)]
Fix build
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
Scott Main [Mon, 26 Mar 2012 21:30:00 +0000 (14:30 -0700)]
am
33666ade: docs: re-add android design icon, which had been removed from original location
* commit '
33666ade7a13f2c466346b05b2a7dd1f0f80cb43':
docs: re-add android design icon, which had been removed from original location
Scott Main [Mon, 26 Mar 2012 20:24:14 +0000 (13:24 -0700)]
docs: re-add android design icon, which had been removed from original location
Change-Id: I30f3a38ab3e80e78595e28c46815874e4a84f2ed
The Android Open Source Project [Mon, 26 Mar 2012 16:47:10 +0000 (09:47 -0700)]
Reconcile with ics-mr1-release
Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157
The Android Automerger [Sun, 25 Mar 2012 19:34:33 +0000 (12:34 -0700)]
IMM76D
The Android Automerger [Fri, 23 Mar 2012 21:38:56 +0000 (14:38 -0700)]
IMM76C
Andrew Hsieh [Thu, 22 Mar 2012 18:03:14 +0000 (11:03 -0700)]
am
2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '
2245d17dc847ecb5371807466788552ca0198152':
Point to new linux prebuilt toolchain for SDK build
Andrew Hsieh [Tue, 13 Mar 2012 09:17:35 +0000 (02:17 -0700)]
Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
Raphael Moll [Thu, 22 Mar 2012 04:52:33 +0000 (21:52 -0700)]
SDK atree: support HOST_OUT location.
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
The Android Open Source Project [Wed, 21 Mar 2012 15:22:52 +0000 (08:22 -0700)]
Reconcile with ics-mr1-release
Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8
The Android Automerger [Wed, 21 Mar 2012 00:15:23 +0000 (17:15 -0700)]
IMM76B
Ying Wang [Tue, 20 Mar 2012 22:22:30 +0000 (15:22 -0700)]
am
301843ae: am
29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '
301843ae3e5a5d121ecc01b58ea3f15ae07c860f':
Fix for "dexopt: No such file or directory" error
Ying Wang [Tue, 20 Mar 2012 22:20:14 +0000 (15:20 -0700)]
am
29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '
29e44b7a8300644516b021e9e324ffe426098b3f':
Fix for "dexopt: No such file or directory" error
Ying Wang [Tue, 20 Mar 2012 18:05:55 +0000 (11:05 -0700)]
Merge "Fix for "dexopt: No such file or directory" error"
The Android Automerger [Sat, 17 Mar 2012 02:36:35 +0000 (19:36 -0700)]
IMM76
The Android Automerger [Sat, 17 Mar 2012 02:30:18 +0000 (19:30 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 14 Mar 2012 00:16:36 +0000 (17:16 -0700)]
IMM72B
The Android Automerger [Tue, 13 Mar 2012 02:36:17 +0000 (19:36 -0700)]
IMM72
The Android Automerger [Tue, 13 Mar 2012 02:30:56 +0000 (19:30 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 11 Mar 2012 08:58:08 +0000 (00:58 -0800)]
second try
The Android Automerger [Sat, 10 Mar 2012 17:10:29 +0000 (09:10 -0800)]
IMM68C
The Android Automerger [Sat, 10 Mar 2012 17:08:53 +0000 (09:08 -0800)]
IMM70
The Android Automerger [Sat, 10 Mar 2012 17:06:03 +0000 (09:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 03:28:10 +0000 (19:28 -0800)]
IMM62B
The Android Automerger [Sat, 10 Mar 2012 03:25:45 +0000 (19:25 -0800)]
IMM69
The Android Automerger [Sat, 10 Mar 2012 03:22:16 +0000 (19:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Mar 2012 17:59:12 +0000 (09:59 -0800)]
IMM68B
The Android Automerger [Fri, 9 Mar 2012 04:49:08 +0000 (20:49 -0800)]
IMM68
The Android Automerger [Fri, 9 Mar 2012 04:42:40 +0000 (20:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Roman Nurik [Tue, 6 Mar 2012 22:41:13 +0000 (14:41 -0800)]
am
d9ca90b4: Add SDK template and assets for Android Design
* commit '
d9ca90b4b9bd631329e6241b1ac4824ad0821639':
Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 20:25:34 +0000 (12:25 -0800)]
Add SDK template and assets for Android Design
Change-Id: Id7a953bf59e5e05242c46cdfb2b425e80424fc2f
Dirk Dougherty [Tue, 6 Mar 2012 05:39:25 +0000 (21:39 -0800)]
am
7d114b19: doc change: assets for play
* commit '
7d114b195d2224ba8c6f8e156467b969317e0bf9':
doc change: assets for play
Dirk Dougherty [Mon, 5 Mar 2012 04:34:56 +0000 (20:34 -0800)]
doc change: assets for play
Change-Id: I58647fd0059c5de54dd7665527a73f61e0d2dd32
The Android Open Source Project [Sat, 3 Mar 2012 00:32:47 +0000 (16:32 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7b6a55cf5ad81aa9ddfd4706a4f5998d3153534e
The Android Automerger [Fri, 2 Mar 2012 19:55:21 +0000 (11:55 -0800)]
IMM62
The Android Automerger [Fri, 2 Mar 2012 19:49:21 +0000 (11:49 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 1 Mar 2012 18:11:36 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9
The Android Automerger [Tue, 28 Feb 2012 23:18:24 +0000 (15:18 -0800)]
IMM59
The Android Automerger [Tue, 28 Feb 2012 23:12:45 +0000 (15:12 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 28 Feb 2012 00:10:34 +0000 (16:10 -0800)]
IMM56D
The Android Automerger [Tue, 28 Feb 2012 00:09:47 +0000 (16:09 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 27 Feb 2012 22:44:07 +0000 (14:44 -0800)]
IMM56C
The Android Automerger [Mon, 27 Feb 2012 22:41:50 +0000 (14:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 27 Feb 2012 20:31:17 +0000 (12:31 -0800)]
IMM56B
The Android Automerger [Mon, 27 Feb 2012 20:28:07 +0000 (12:28 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 25 Feb 2012 18:45:47 +0000 (10:45 -0800)]
IMM56
The Android Automerger [Sat, 25 Feb 2012 18:41:34 +0000 (10:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 24 Feb 2012 21:57:33 +0000 (13:57 -0800)]
Reconcile with ics-mr1-release
Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:32:08 +0000 (11:32 -0800)]
am
20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '
20b970e25227c4144c61d0d6108905616dc4f08b':
Issue warning when "make snod" with dexpreopt enabled.
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:20:14 +0000 (11:20 -0800)]
Merge "Issue warning when "make snod" with dexpreopt enabled."
Ying Wang [Fri, 24 Feb 2012 19:05:48 +0000 (11:05 -0800)]
Issue warning when "make snod" with dexpreopt enabled.
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
The Android Automerger [Thu, 23 Feb 2012 18:48:19 +0000 (10:48 -0800)]
IMM54
The Android Automerger [Thu, 23 Feb 2012 18:43:30 +0000 (10:43 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:34:42 +0000 (15:34 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib089acee59a2ac7913b5d35185f165f777800626
The Android Automerger [Tue, 21 Feb 2012 23:30:40 +0000 (15:30 -0800)]
IMM52
The Android Automerger [Tue, 21 Feb 2012 23:25:53 +0000 (15:25 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:06:21 +0000 (15:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3f6da4c538fdb160bed6228d1d57026c7e9c12eb
Xavier Ducrohet [Sat, 18 Feb 2012 01:08:29 +0000 (17:08 -0800)]
am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
fe53eeb07617540dc4a920561f4bd2d4f8ae0aa9':
Declare the emulator as a multi-touch device.
Xavier Ducrohet [Sat, 18 Feb 2012 01:05:52 +0000 (17:05 -0800)]
Declare the emulator as a multi-touch device.
Also add the default handheld features.
Change-Id: I768094e5e9ef474ee4f6cce5c87c37b3681926ee
The Android Automerger [Sat, 18 Feb 2012 00:42:18 +0000 (16:42 -0800)]
IMM48
The Android Automerger [Sat, 18 Feb 2012 00:36:53 +0000 (16:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 17 Feb 2012 16:09:26 +0000 (08:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4b9445667934514a9c04ed8df17f422d7c3755aa
Xavier Ducrohet [Fri, 17 Feb 2012 00:37:51 +0000 (16:37 -0800)]
am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
295cb9bceef599f851db81a3942dc78bdb679fec':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:35:42 +0000 (16:35 -0800)]
Enable HW accelerated view framework for generic_x86 builds.
Change-Id: Ib3bf3e7c08615c29c0086125552ae1a96a737b89
The Android Automerger [Fri, 17 Feb 2012 00:29:10 +0000 (16:29 -0800)]
IMM47B
The Android Automerger [Fri, 17 Feb 2012 00:24:21 +0000 (16:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 16 Feb 2012 18:02:06 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3cf7e38adf5847f0b3327c738cf38c0df9abcdea
The Android Automerger [Thu, 16 Feb 2012 17:43:11 +0000 (09:43 -0800)]
IMM47
The Android Automerger [Thu, 16 Feb 2012 17:39:02 +0000 (09:39 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Wed, 15 Feb 2012 22:04:45 +0000 (14:04 -0800)]
Move AOSP to another fake version number
Change-Id: Ida0282d1eccaa2bdaf4ca54aaf82680efdbaa271
The Android Automerger [Wed, 15 Feb 2012 20:35:15 +0000 (12:35 -0800)]
IMM46
The Android Automerger [Wed, 15 Feb 2012 20:30:49 +0000 (12:30 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 14 Feb 2012 22:51:24 +0000 (14:51 -0800)]
am
e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""
* commit '
e77542205f36f063c68407a7de0af2ce80e856d3':
Merge "Move Windows SDK whitelist out of main.mk"
The Android Automerger [Tue, 14 Feb 2012 22:20:59 +0000 (14:20 -0800)]
IMM45
The Android Automerger [Tue, 14 Feb 2012 22:13:48 +0000 (14:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 14 Feb 2012 21:08:13 +0000 (13:08 -0800)]
Merge "Merge "Move Windows SDK whitelist out of main.mk""
Raphael Moll [Thu, 26 Jan 2012 23:11:46 +0000 (15:11 -0800)]
Merge "Move Windows SDK whitelist out of main.mk"
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.
Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git
(cherry-pick of
347f3051814d7d36a9a6af387e724bb327b53ecd)
Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
The Android Automerger [Tue, 14 Feb 2012 00:36:49 +0000 (16:36 -0800)]
IMM30E
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:27:27 +0000 (14:27 -0800)]
am
45873583: Merge "Add extra environment info to build output"
* commit '
458735839a82d2d381edbe71ed924d309bf07c55':
Add extra environment info to build output
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:23:30 +0000 (14:23 -0800)]
Merge "Add extra environment info to build output"
Conley Owens [Tue, 7 Feb 2012 19:16:42 +0000 (11:16 -0800)]
Add extra environment info to build output
This should help us support users with build issues.
Given that they inculde the dumpvars in their error report,
we will be able to avoid asking standard questions like
"what version of Ubuntu are you using?"
Change-Id: Ib7c452d805d5e64075a44dc40e41d4605cc1ef4a
The Android Open Source Project [Tue, 7 Feb 2012 18:09:02 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8399f0a69c4192e7ef65e3097e7a6820e400e436
The Android Automerger [Tue, 7 Feb 2012 04:29:06 +0000 (20:29 -0800)]
IMM30D
Ed Heyl [Mon, 6 Feb 2012 21:09:03 +0000 (13:09 -0800)]
am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
daeb1d90415f645269d10d7d61c17c59a5cad61f':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:07:38 +0000 (13:07 -0800)]
am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
c547a4d50b92c8f8173bf4222169f87200a76dba':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:03:43 +0000 (13:03 -0800)]
Please do not merge (already submitted downstream); check entire recovery partition on startup
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.
Bug:
5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
The Android Automerger [Mon, 6 Feb 2012 16:44:05 +0000 (08:44 -0800)]
IMM30C
The Android Automerger [Mon, 6 Feb 2012 16:42:38 +0000 (08:42 -0800)]
IMM3C
Jean-Baptiste Queru [Fri, 3 Feb 2012 06:34:18 +0000 (22:34 -0800)]
am
9a741915: Merge "Add annotations to the sdk build."
* commit '
9a7419153e7fffa6056a24b567ff3f45111aa0c0':
Add annotations to the sdk build.
Jean-Baptiste Queru [Thu, 2 Feb 2012 21:43:06 +0000 (13:43 -0800)]
Merge "Add annotations to the sdk build."
Xavier Ducrohet [Fri, 27 Jan 2012 23:45:35 +0000 (15:45 -0800)]
Add annotations to the sdk build.
Change-Id: I22ab1e737f05f6134ec9701c8ed69642a3708fbf
The Android Open Source Project [Wed, 1 Feb 2012 16:42:31 +0000 (08:42 -0800)]
Reconcile with ics-mr1-release
Change-Id: Icc486a00d6c067c87364023fcf7226686dc0642a
The Android Automerger [Wed, 1 Feb 2012 00:24:20 +0000 (16:24 -0800)]
IMM30B
The Android Automerger [Tue, 31 Jan 2012 23:43:31 +0000 (15:43 -0800)]
IMM29
OSDN Git Service
