The Android Open Source Project
134c0348f9
Reconcile with ics-mr1-release
...
Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497
2012-02-24 13:57:33 -08:00
Jean-Baptiste Queru
9950526875
am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
...
* commit '20b970e25227c4144c61d0d6108905616dc4f08b':
Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:32:08 -08:00
Jean-Baptiste Queru
20b970e252
Merge "Issue warning when "make snod" with dexpreopt enabled."
2012-02-24 11:20:15 -08:00
Ying Wang
acf01ec837
Issue warning when "make snod" with dexpreopt enabled.
...
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
2012-02-24 11:05:48 -08:00
The Android Automerger
ea6f0e027d
IMM54
2012-02-23 10:48:19 -08:00
The Android Automerger
3d6b6d3c74
merge in ics-mr1-release history after reset to ics-mr1
2012-02-23 10:43:30 -08:00
The Android Open Source Project
065506ec25
Reconcile with ics-mr1-release
...
Change-Id: Ib089acee59a2ac7913b5d35185f165f777800626
2012-02-21 15:34:42 -08:00
The Android Automerger
c7887ba198
IMM52
2012-02-21 15:30:40 -08:00
The Android Automerger
f5e409b448
merge in ics-mr1-release history after reset to ics-mr1
2012-02-21 15:25:53 -08:00
The Android Open Source Project
a2ca4f14f4
Reconcile with ics-mr1-release
...
Change-Id: I3f6da4c538fdb160bed6228d1d57026c7e9c12eb
2012-02-21 15:06:21 -08:00
Xavier Ducrohet
c06eaa4cad
am fe53eeb0: Declare the emulator as a multi-touch device.
...
* commit 'fe53eeb07617540dc4a920561f4bd2d4f8ae0aa9':
Declare the emulator as a multi-touch device.
2012-02-17 17:08:29 -08:00
Xavier Ducrohet
fe53eeb076
Declare the emulator as a multi-touch device.
...
Also add the default handheld features.
Change-Id: I768094e5e9ef474ee4f6cce5c87c37b3681926ee
2012-02-17 17:05:52 -08:00
The Android Automerger
2499fddf21
IMM48
2012-02-17 16:42:18 -08:00
The Android Automerger
551a03b131
merge in ics-mr1-release history after reset to ics-mr1
2012-02-17 16:36:53 -08:00
The Android Open Source Project
72c4afc998
Reconcile with ics-mr1-release
...
Change-Id: I4b9445667934514a9c04ed8df17f422d7c3755aa
2012-02-17 08:09:26 -08:00
Xavier Ducrohet
590737b674
am 295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
...
* commit '295cb9bceef599f851db81a3942dc78bdb679fec':
Enable HW accelerated view framework for generic_x86 builds.
2012-02-16 16:37:51 -08:00
Xavier Ducrohet
295cb9bcee
Enable HW accelerated view framework for generic_x86 builds.
...
Change-Id: Ib3bf3e7c08615c29c0086125552ae1a96a737b89
2012-02-16 16:35:42 -08:00
The Android Automerger
f37b2f20fa
IMM47B
2012-02-16 16:29:10 -08:00
The Android Automerger
f7f0c08859
merge in ics-mr1-release history after reset to ics-mr1
2012-02-16 16:24:21 -08:00
The Android Open Source Project
6532f0e55b
Reconcile with ics-mr1-release
...
Change-Id: I3cf7e38adf5847f0b3327c738cf38c0df9abcdea
2012-02-16 10:02:06 -08:00
The Android Automerger
1426e71355
IMM47
2012-02-16 09:43:11 -08:00
The Android Automerger
9d9733b50f
merge in ics-mr1-release history after reset to ics-mr1
2012-02-16 09:39:02 -08:00
Jean-Baptiste Queru
605643224e
Move AOSP to another fake version number
...
Change-Id: Ida0282d1eccaa2bdaf4ca54aaf82680efdbaa271
2012-02-15 14:04:45 -08:00
The Android Automerger
e302b8ad8c
IMM46
2012-02-15 12:35:15 -08:00
The Android Automerger
61ab83cd55
merge in ics-mr1-release history after reset to ics-mr1
2012-02-15 12:30:49 -08:00
Jean-Baptiste Queru
aa9c5b9f89
am e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""
...
* commit 'e77542205f36f063c68407a7de0af2ce80e856d3':
Merge "Move Windows SDK whitelist out of main.mk"
2012-02-14 14:51:24 -08:00
The Android Automerger
6f0bb0b907
IMM45
2012-02-14 14:20:59 -08:00
The Android Automerger
e8d71358ac
merge in ics-mr1-release history after reset to ics-mr1
2012-02-14 14:13:48 -08:00
Jean-Baptiste Queru
e77542205f
Merge "Merge "Move Windows SDK whitelist out of main.mk""
2012-02-14 13:08:14 -08:00
Raphael Moll
c04b56c5b0
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 347f305181
2012-02-14 11:12:02 -08:00
The Android Automerger
8d15492d5e
IMM30E
2012-02-13 16:36:49 -08:00
Jean-Baptiste Queru
d93d46016d
am 45873583: Merge "Add extra environment info to build output"
...
* commit '458735839a82d2d381edbe71ed924d309bf07c55':
Add extra environment info to build output
2012-02-13 14:27:27 -08:00
Jean-Baptiste Queru
458735839a
Merge "Add extra environment info to build output"
2012-02-13 14:23:32 -08:00
Conley Owens
5f1c9ba0b8
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
2012-02-07 11:16:42 -08:00
The Android Open Source Project
62a16e2305
Reconcile with ics-mr1-release
...
Change-Id: I8399f0a69c4192e7ef65e3097e7a6820e400e436
2012-02-07 10:09:02 -08:00
The Android Automerger
a7af7e050e
IMM30D
2012-02-06 20:29:06 -08:00
Ed Heyl
ca2cd25b35
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
2012-02-06 13:09:03 -08:00
Ed Heyl
daeb1d9041
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
2012-02-06 13:07:38 -08:00
Ed Heyl
c547a4d50b
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
2012-02-06 13:03:43 -08:00
The Android Automerger
7134fbe50f
IMM30C
2012-02-06 08:44:05 -08:00
The Android Automerger
7410fbd593
IMM3C
2012-02-06 08:42:38 -08:00
Jean-Baptiste Queru
5aec09b5f3
am 9a741915: Merge "Add annotations to the sdk build."
...
* commit '9a7419153e7fffa6056a24b567ff3f45111aa0c0':
Add annotations to the sdk build.
2012-02-02 22:34:18 -08:00
Jean-Baptiste Queru
9a7419153e
Merge "Add annotations to the sdk build."
2012-02-02 13:43:07 -08:00
Xavier Ducrohet
d79f950820
Add annotations to the sdk build.
...
Change-Id: I22ab1e737f05f6134ec9701c8ed69642a3708fbf
2012-02-02 13:41:19 -08:00
The Android Open Source Project
402e36f189
Reconcile with ics-mr1-release
...
Change-Id: Icc486a00d6c067c87364023fcf7226686dc0642a
2012-02-01 08:42:31 -08:00
The Android Automerger
9ffda11f19
IMM30B
2012-01-31 16:24:20 -08:00
The Android Automerger
c1c74182e3
IMM29
2012-01-31 15:43:31 -08:00
The Android Automerger
04b1cdbe28
merge in ics-mr1-release history after reset to ics-mr1
2012-01-31 15:40:59 -08:00
Scott Main
a57f538a22
am 7f24ddbc: Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1
...
* commit '7f24ddbc75b301cd3520e8fefaeb2e94a6dcc80b':
docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
2012-01-31 15:21:32 -08:00
Scott Main
7f24ddbc75
Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1
2012-01-31 15:19:44 -08:00
