OSDN Git Service
The Android Open Source Project [Sat, 3 Mar 2012 00:44:17 +0000 (16:44 -0800)]
am
719c9e02: Reconcile with ics-mr1-release
* commit '
719c9e027297693d8874a4c3f8864387b9a93154':
The Android Open Source Project [Sat, 3 Mar 2012 00:41:32 +0000 (16:41 -0800)]
Reconcile with ics-mr1-release
Change-Id: I2484dad4a2ab183880aeede3685b6e0bae83ab82
The Android Open Source Project [Sat, 3 Mar 2012 00:35:21 +0000 (16:35 -0800)]
am
f1b829d1: Reconcile with ics-mr1-release
* commit '
f1b829d19d71df2228a7af2a253877edeaa0f2f0':
IMM62
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:43:33 +0000 (10:43 -0800)]
am
0f03bad3: Reconcile with ics-mr1-release
* commit '
0f03bad3fe7e82838c3bedf220fcf1c1056f6ffb':
The Android Open Source Project [Thu, 1 Mar 2012 18:39:57 +0000 (10:39 -0800)]
Reconcile with ics-mr1-release
Change-Id: I33df3a369f056bd2369452fd056e0de355e6f9b4
The Android Open Source Project [Thu, 1 Mar 2012 18:14:18 +0000 (10:14 -0800)]
am
2ab3572b: Reconcile with ics-mr1-release
* commit '
2ab3572ba3431e45b7dbedaa4573b00fa80826b2':
IMM59
IMM56D
IMM56C
IMM56B
IMM56
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 22:09:27 +0000 (14:09 -0800)]
am
d58f3d2b: Reconcile with ics-mr1-release
* commit '
d58f3d2bc47015f7a55b88ff56850b9990689e22':
The Android Open Source Project [Fri, 24 Feb 2012 22:05:46 +0000 (14:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: Idc7bbf210376184867a6265475e34967c00b1315
The Android Open Source Project [Fri, 24 Feb 2012 21:59:21 +0000 (13:59 -0800)]
am
134c0348: Reconcile with ics-mr1-release
* commit '
134c0348f9643eff06e1d69f7a144a1870aa29e4':
IMM54
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:36:52 +0000 (11:36 -0800)]
am
99505268: am
20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '
9950526875f3b71c764a6d39623842e3c26416db':
Issue warning when "make snod" with dexpreopt enabled.
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:38:23 +0000 (15:38 -0800)]
am
d0d7086f: Reconcile with ics-mr1-release
* commit '
d0d7086fb6012b72731fcefeabe92edccaaf89eb':
The Android Open Source Project [Tue, 21 Feb 2012 23:36:39 +0000 (15:36 -0800)]
am
065506ec: Reconcile with ics-mr1-release
* commit '
065506ec25b39b1abdcefb483992d71be70defb6':
IMM52
The Android Open Source Project [Tue, 21 Feb 2012 23:36:28 +0000 (15:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie9e79a16a3541f85ef9d1a7ffd4fe470c3570a16
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:15:26 +0000 (15:15 -0800)]
am
96859329: Reconcile with ics-mr1-release
* commit '
96859329d3f9a7a1c9834810e16747e205ea16c7':
The Android Open Source Project [Tue, 21 Feb 2012 23:13:23 +0000 (15:13 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4c70661759198e26a86a1070746a9b609598a2f2
The Android Open Source Project [Tue, 21 Feb 2012 23:08:13 +0000 (15:08 -0800)]
am
a2ca4f14: Reconcile with ics-mr1-release
* commit '
a2ca4f14f43636b00aba274718854e9ed851959d':
IMM48
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 [Sun, 19 Feb 2012 15:46:07 +0000 (07:46 -0800)]
am
87e90f4e: am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
87e90f4e3b05aaa6d759f744fc8f835b9394b6e3':
Xavier Ducrohet [Sat, 18 Feb 2012 01:10:32 +0000 (17:10 -0800)]
am
c06eaa4c: am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
c06eaa4cadd32825a8b3a1bda7bba83ceccb7e00':
Declare the emulator as a multi-touch device.
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: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 17:04:04 +0000 (09:04 -0800)]
am
0e511149: Reconcile with ics-mr1-release
* commit '
0e51114927aecac7a283eee4d6449709027224d5':
The Android Open Source Project [Fri, 17 Feb 2012 17:02:41 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia3e6e7211e43f82053ebbdd87f4bfacf13d2495a
The Android Open Source Project [Fri, 17 Feb 2012 16:11:33 +0000 (08:11 -0800)]
am
72c4afc9: Reconcile with ics-mr1-release
* commit '
72c4afc998d6362d94acfa943349091993edad11':
IMM47B
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:40:53 +0000 (16:40 -0800)]
am
d9bd216e: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
d9bd216ea7d3030b84c61d551b87781269e418a7':
Xavier Ducrohet [Fri, 17 Feb 2012 00:39:53 +0000 (16:39 -0800)]
am
590737b6: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
590737b674a1e9254863e36f45956a9c309db68f':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:38:39 +0000 (16:38 -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: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:11:48 +0000 (10:11 -0800)]
am
4b067bdf: Reconcile with ics-mr1-release
* commit '
4b067bdf05bd8fca840253a43fb0ff25846d35c1':
The Android Open Source Project [Thu, 16 Feb 2012 18:09:59 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I148d68967a5aef6aef6c785222a35ff242406525
The Android Open Source Project [Thu, 16 Feb 2012 18:04:14 +0000 (10:04 -0800)]
am
6532f0e5: Reconcile with ics-mr1-release
* commit '
6532f0e55b4340fe91a1097d3ddd72282b4de50d':
IMM47
IMM46
IMM45
IMM30E
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:09:07 +0000 (14:09 -0800)]
am
60564322: Move AOSP to another fake version number
* commit '
605643224e096c43602c2e0e229410fa387e3331':
Move AOSP to another fake version number
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 [Wed, 15 Feb 2012 00:25:15 +0000 (16:25 -0800)]
am
aa9c5b9f: am
e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""
* commit '
aa9c5b9f89047642010fe165f7815e1fb67b867c':
Merge "Move Windows SDK whitelist out of main.mk"
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:39:55 +0000 (14:39 -0800)]
am
d93d4601: am
45873583: Merge "Add extra environment info to build output"
* commit '
d93d46016d29925e13552b97a71f89956a1dddf4':
Add extra environment info to build output
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:19:45 +0000 (10:19 -0800)]
am
c9024703: Reconcile with ics-mr1-release
* commit '
c902470310404e42aeb93fca38694b374371e0de':
The Android Open Source Project [Tue, 7 Feb 2012 18:18:29 +0000 (10:18 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib912870641c7efedd4c01066f0e86dd3f85aaa2d
The Android Open Source Project [Tue, 7 Feb 2012 18:11:09 +0000 (10:11 -0800)]
am
62a16e23: Reconcile with ics-mr1-release
* commit '
62a16e230529ec015518a3abac872ab008892e2d':
IMM30D
IMM30C
IMM3C
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:11:16 +0000 (13:11 -0800)]
am
529a793c: am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
529a793c69f7ab133a29da8e50e67e8e47f2175f':
Ed Heyl [Mon, 6 Feb 2012 21:10:25 +0000 (13:10 -0800)]
am
ca2cd25b: (-s ours) am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
ca2cd25b3542749e491b1c00aeca5d3f59c99ad9':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:09:28 +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: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:37:26 +0000 (22:37 -0800)]
am
5aec09b5: am
9a741915: Merge "Add annotations to the sdk build."
* commit '
5aec09b5f3537d0c700b93ede1718a97dbec0050':
Add annotations to the sdk build.
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 17:57:50 +0000 (09:57 -0800)]
Ignore
75c781c9
Change-Id: Id97047a665c03bcf35785fba3785cf5575f3341b
The Android Open Source Project [Wed, 1 Feb 2012 16:49:25 +0000 (08:49 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1d101ce7d4690a74f494cdc605e797130946210c
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
OSDN Git Service
