OSDN Git Service
The Android Automerger [Thu, 19 Jan 2012 05:16:29 +0000 (21:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 14 Jan 2012 00:21:18 +0000 (16:21 -0800)]
IMM13
The Android Automerger [Sat, 14 Jan 2012 00:16:51 +0000 (16:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 12 Jan 2012 22:04:09 +0000 (14:04 -0800)]
IMM12
The Android Automerger [Thu, 12 Jan 2012 22:00:23 +0000 (14:00 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 12 Jan 2012 00:31:51 +0000 (16:31 -0800)]
IMM11
The Android Automerger [Thu, 12 Jan 2012 00:27:43 +0000 (16:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Wed, 11 Jan 2012 01:14:34 +0000 (17:14 -0800)]
Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
Vladimir Chtchetkine [Tue, 13 Dec 2011 19:31:54 +0000 (11:31 -0800)]
Cherry-picked from
e6b969f3b in Do not merge.
Add boot property enabling ADBD over QEMU
Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.
Change-Id: I978489c5acf46177b520e775d745bcc78f469837
Scott Main [Tue, 10 Jan 2012 17:59:22 +0000 (09:59 -0800)]
docs: add css for Android Design links and add link to site header
Change-Id: I0a9469519076b1c5b9d7c121df1f2c731a08d2cb
The Android Automerger [Sat, 7 Jan 2012 00:34:51 +0000 (16:34 -0800)]
IMM06
The Android Automerger [Sat, 7 Jan 2012 00:31:06 +0000 (16:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
ChainsDD [Tue, 24 Aug 2010 00:07:31 +0000 (19:07 -0500)]
Add the keys I used to sign the market version of Superuser.
The Android Automerger [Thu, 5 Jan 2012 00:45:21 +0000 (16:45 -0800)]
IMM04
The Android Automerger [Thu, 5 Jan 2012 00:41:01 +0000 (16:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ed Heyl [Thu, 5 Jan 2012 00:34:18 +0000 (16:34 -0800)]
increment version to 4.0.4
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
Justin Lebar [Mon, 17 Oct 2011 22:39:18 +0000 (18:39 -0400)]
Fix GCC 4.6 build error (_FORTIFY_SOURCE redefined)
The Android Automerger [Wed, 21 Dec 2011 01:29:41 +0000 (17:29 -0800)]
IML81
The Android Automerger [Wed, 21 Dec 2011 01:26:02 +0000 (17:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Wei Huang [Wed, 30 Nov 2011 11:55:47 +0000 (19:55 +0800)]
change generic_x86 to be the default target of ics-x86
The real configurations of generic_x86 locates in device/common/generic_x86.
Chih-Wei Huang [Sun, 20 Nov 2011 07:40:46 +0000 (15:40 +0800)]
add kernel modules.dep to $(INTERNAL_SYSTEMIMAGE_FILES)
Chih-Wei Huang [Wed, 16 Mar 2011 02:37:30 +0000 (10:37 +0800)]
add rules to generate system.sfs
The Android Automerger [Sun, 18 Dec 2011 01:30:21 +0000 (17:30 -0800)]
IML77B
The Android Automerger [Fri, 16 Dec 2011 20:02:53 +0000 (12:02 -0800)]
IML77
The Android Automerger [Fri, 16 Dec 2011 20:01:24 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 16 Dec 2011 08:15:10 +0000 (00:15 -0800)]
IML74K
The Android Automerger [Fri, 16 Dec 2011 05:43:32 +0000 (21:43 -0800)]
IML74J
The Android Automerger [Fri, 16 Dec 2011 04:50:23 +0000 (20:50 -0800)]
IML74I
The Android Automerger [Fri, 16 Dec 2011 04:49:52 +0000 (20:49 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 16 Dec 2011 04:18:19 +0000 (20:18 -0800)]
IML74H
Scott Main [Fri, 16 Dec 2011 04:09:04 +0000 (20:09 -0800)]
am
50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '
50d6f97c46934014894a43d3610029f579145713':
docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
Scott Main [Fri, 16 Dec 2011 04:06:32 +0000 (20:06 -0800)]
docs: revise space wrapping to avoid "new" tags from breaking new lines alone
Temp fix
Change-Id: If99ce3442ec179a46fe3bbe0a06f690527d05eb5
Scott Main [Fri, 16 Dec 2011 03:14:31 +0000 (19:14 -0800)]
am
0f429ebe: docs: fix bug in script for tab cookies
* commit '
0f429ebe63acbf8ccc1efe3c4185151eb15a4783':
docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:12:17 +0000 (19:12 -0800)]
docs: fix bug in script for tab cookies
Change-Id: I09a49764f66673b3f55032158efd44c228832e8f
Scott Main [Fri, 16 Dec 2011 01:37:35 +0000 (17:37 -0800)]
am
1d42360a: docs: style and script changes for android u classes
* commit '
1d42360a028b2d55f6d4d29bd99e8ef3de6e8402':
docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:34:40 +0000 (17:34 -0800)]
docs: style and script changes for android u classes
Change-Id: I5866541bb9dd41329aa02328b805959c8f675f8c
The Android Automerger [Thu, 15 Dec 2011 06:16:29 +0000 (22:16 -0800)]
IML75
The Android Automerger [Thu, 15 Dec 2011 06:13:33 +0000 (22:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 15 Dec 2011 03:28:43 +0000 (19:28 -0800)]
IML74G
The Android Automerger [Wed, 14 Dec 2011 23:56:03 +0000 (15:56 -0800)]
IML74F
The Android Automerger [Wed, 14 Dec 2011 23:44:48 +0000 (15:44 -0800)]
IML74E
Brian Muramatsu [Wed, 14 Dec 2011 23:31:35 +0000 (15:31 -0800)]
Merge "Build Support for CTS Native Tests" into ics-mr1
The Android Automerger [Wed, 14 Dec 2011 04:00:27 +0000 (20:00 -0800)]
IML74D
The Android Automerger [Wed, 14 Dec 2011 02:54:33 +0000 (18:54 -0800)]
IML74C
The Android Automerger [Wed, 14 Dec 2011 01:36:34 +0000 (17:36 -0800)]
IML74B
The Android Automerger [Wed, 14 Dec 2011 01:35:59 +0000 (17:35 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 14 Dec 2011 00:06:06 +0000 (16:06 -0800)]
IML74
The Android Automerger [Wed, 14 Dec 2011 00:02:06 +0000 (16:02 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Brian Muramatsu [Tue, 13 Dec 2011 07:54:49 +0000 (23:54 -0800)]
Build Support for CTS Native Tests
Bug
4970300
Adds two new variables, CTS_TEST_CASES and CTS_TEST_XMLS, to be read
from CtsTestCaseList.mk. The CTS_TEST_CASES variable can be used to
copy any sort of file to the repository/testcases CTS directory.
The CTS_TEST_XMLS variable can be used to inject test package xmls
from any source rather than relying upon the monolithic and
mostly serial buildCts.py script.
The existing CTS_CORE_CASE_LIST is coded to only support APKs, so
it could not be retrofitted to support native tests. However, the
two new variables can do even more than CTS_CORE_CASE_LIST due to
their generality. In the future, the idea is move away from
CTS_CORE_CASE_LIST and also generate XMLs using separate tools
rather than just buildCts.py.
Change-Id: Ib52722861c37e0f4d511f9041928395bcaba5dea
The Android Automerger [Tue, 13 Dec 2011 06:11:29 +0000 (22:11 -0800)]
IML73
The Android Automerger [Tue, 13 Dec 2011 06:07:51 +0000 (22:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jesse Hall [Thu, 1 Dec 2011 19:45:49 +0000 (11:45 -0800)]
Enable the OpenGL View renderer on the emulator
If the emulator is run without GL acceleration enabled, the OpenGL
renderer will disable itself at runtime.
Change-Id: Ie40c7895120f51bb6a817c2f3cf7fab0a3dda292
The Android Automerger [Sun, 11 Dec 2011 05:35:46 +0000 (21:35 -0800)]
IML70C
The Android Automerger [Sat, 10 Dec 2011 00:19:55 +0000 (16:19 -0800)]
IML70B
The Android Automerger [Sat, 10 Dec 2011 00:15:20 +0000 (16:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Dec 2011 14:59:51 +0000 (06:59 -0800)]
IML70
The Android Automerger [Fri, 9 Dec 2011 14:57:15 +0000 (06:57 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Dec 2011 01:37:41 +0000 (17:37 -0800)]
IML69C
The Android Automerger [Fri, 9 Dec 2011 01:34:09 +0000 (17:34 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 8 Dec 2011 19:30:49 +0000 (11:30 -0800)]
IML69B
The Android Open Source Project [Thu, 8 Dec 2011 18:25:56 +0000 (10:25 -0800)]
Reconcile with ics-mr0-release
Change-Id: I7b413162b41b52be626b4ebc5c3f3ea37fdc6288
The Android Automerger [Thu, 8 Dec 2011 15:03:55 +0000 (07:03 -0800)]
IML69
The Android Automerger [Thu, 8 Dec 2011 14:59:23 +0000 (06:59 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 8 Dec 2011 00:42:26 +0000 (16:42 -0800)]
ICL53F
The Android Automerger [Wed, 7 Dec 2011 19:15:49 +0000 (11:15 -0800)]
IML67B
Dianne Hackborn [Tue, 6 Dec 2011 02:14:12 +0000 (18:14 -0800)]
Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
The Android Open Source Project [Wed, 7 Dec 2011 15:24:51 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19
The Android Automerger [Wed, 7 Dec 2011 00:56:46 +0000 (16:56 -0800)]
IML67
The Android Automerger [Wed, 7 Dec 2011 00:53:04 +0000 (16:53 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 6 Dec 2011 22:23:43 +0000 (14:23 -0800)]
ICL53E
The Android Open Source Project [Tue, 6 Dec 2011 16:56:01 +0000 (08:56 -0800)]
Reconcile with ics-mr0-release
Change-Id: I224ac8e665f91c64935f7a20397b925aba767994
The Android Automerger [Tue, 6 Dec 2011 13:23:26 +0000 (05:23 -0800)]
ICL53D
The Android Automerger [Tue, 6 Dec 2011 04:38:05 +0000 (20:38 -0800)]
IML66
The Android Automerger [Tue, 6 Dec 2011 04:34:59 +0000 (20:34 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 3 Dec 2011 00:23:13 +0000 (16:23 -0800)]
IML63B
The Android Automerger [Sat, 3 Dec 2011 00:20:17 +0000 (16:20 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Doug Zongker [Fri, 2 Dec 2011 18:46:59 +0000 (10:46 -0800)]
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 [Fri, 2 Dec 2011 18:27:28 +0000 (10:27 -0800)]
IML63
The Android Automerger [Fri, 2 Dec 2011 18:24:07 +0000 (10:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Fri, 2 Dec 2011 04:40:59 +0000 (20:40 -0800)]
am
f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous link
* commit '
f5cbe0024328f6d716dc13b8a836f058c9c74c64':
docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
Scott Main [Fri, 2 Dec 2011 04:39:29 +0000 (20:39 -0800)]
Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button." into ics-mr0
The Android Automerger [Fri, 2 Dec 2011 00:47:38 +0000 (16:47 -0800)]
IML62B
The Android Automerger [Fri, 2 Dec 2011 00:45:02 +0000 (16:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 1 Dec 2011 14:48:19 +0000 (06:48 -0800)]
IML62
The Android Automerger [Thu, 1 Dec 2011 14:45:22 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Thu, 1 Dec 2011 02:55:01 +0000 (18:55 -0800)]
docs: update template and css for android u
Add a custom version of docpage.cs to the droiddoc template, because
it adds a good deal of custom design and behavior (instead of updating
the doclava version of the file). Add CSS for next/previous links in
android u lessons and revise style for download button.
Change-Id: I829c4fb134d6f5c3cee82fb86958d23ef64e8481
The Android Automerger [Thu, 1 Dec 2011 00:59:51 +0000 (16:59 -0800)]
IML61B
Marius Renn [Wed, 30 Nov 2011 17:51:17 +0000 (09:51 -0800)]
Merge "Google Add-On API Documentation Fixes (
5429077)" into ics-mr1
The Android Automerger [Wed, 30 Nov 2011 14:48:37 +0000 (06:48 -0800)]
IML61
The Android Automerger [Wed, 30 Nov 2011 14:45:15 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 30 Nov 2011 01:08:24 +0000 (17:08 -0800)]
IML60C
The Android Automerger [Tue, 29 Nov 2011 23:28:27 +0000 (15:28 -0800)]
IML60B
The Android Automerger [Tue, 29 Nov 2011 20:05:06 +0000 (12:05 -0800)]
IML60
The Android Automerger [Tue, 29 Nov 2011 20:02:12 +0000 (12:02 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 29 Nov 2011 15:54:00 +0000 (07:54 -0800)]
Reconcile with ics-mr0-release
Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5
Tor Norbye [Mon, 28 Nov 2011 21:37:17 +0000 (13:37 -0800)]
am
5dd51bde: Build fix - include sdk/lint in build. do not merge.
* commit '
5dd51bde0b0b4a8ca6d1b6a8da1f6739197999a2':
Build fix - include sdk/lint in build. do not merge.
Tor Norbye [Fri, 21 Oct 2011 02:18:15 +0000 (19:18 -0700)]
Build fix - include sdk/lint in build. do not merge.
(cherry picked from commit
4377cc701a0bef32aaff34d0d119974544fd20d6)
Change-Id: I28dd89ad6471c82d344ecf88cecb2b96361b2050
The Android Automerger [Mon, 28 Nov 2011 20:25:45 +0000 (12:25 -0800)]
IML59
The Android Automerger [Mon, 28 Nov 2011 20:21:20 +0000 (12:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 26 Nov 2011 20:29:48 +0000 (12:29 -0800)]
ICL53C
OSDN Git Service
