OSDN Git Service
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 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
Marius Renn [Thu, 24 Nov 2011 02:02:46 +0000 (18:02 -0800)]
Google Add-On API Documentation Fixes (
5429077)
We no longer want a reference directory, but rather
maps_api and effects_api directories.
Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
The Android Open Source Project [Wed, 23 Nov 2011 17:23:46 +0000 (09:23 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6
The Android Automerger [Wed, 23 Nov 2011 05:50:14 +0000 (21:50 -0800)]
ITL41G
The Android Automerger [Wed, 23 Nov 2011 00:14:07 +0000 (16:14 -0800)]
ICL53B
The Android Automerger [Wed, 23 Nov 2011 00:13:00 +0000 (16:13 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Tue, 22 Nov 2011 23:23:59 +0000 (15:23 -0800)]
Reconcile with ics-mr0-release
Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc
The Android Automerger [Tue, 22 Nov 2011 22:29:10 +0000 (14:29 -0800)]
ICL53
The Android Automerger [Tue, 22 Nov 2011 22:26:36 +0000 (14:26 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Tue, 22 Nov 2011 21:19:59 +0000 (13:19 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie25ab898e849e7d52c08796cd7f1bea6f12d6bd1
The Android Automerger [Tue, 22 Nov 2011 20:02:47 +0000 (12:02 -0800)]
IML52C
The Android Automerger [Tue, 22 Nov 2011 19:58:43 +0000 (11:58 -0800)]
IML53
The Android Automerger [Tue, 22 Nov 2011 19:55:18 +0000 (11:55 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 22 Nov 2011 03:29:29 +0000 (19:29 -0800)]
IML52B
The Android Automerger [Tue, 22 Nov 2011 01:45:13 +0000 (17:45 -0800)]
IML52
The Android Automerger [Tue, 22 Nov 2011 01:40:35 +0000 (17:40 -0800)]
ITL41F
The Android Automerger [Mon, 21 Nov 2011 21:41:52 +0000 (13:41 -0800)]
ITL41E
The Android Automerger [Mon, 21 Nov 2011 21:08:17 +0000 (13:08 -0800)]
ICL52
The Android Automerger [Mon, 21 Nov 2011 21:06:53 +0000 (13:06 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Bart Sears [Mon, 21 Nov 2011 05:03:42 +0000 (21:03 -0800)]
resolved conflicts for merge of
aca203ff to ics-mr1
Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149
Bart Sears [Sat, 19 Nov 2011 00:39:59 +0000 (16:39 -0800)]
ICS MR0.1 will be version 4.0.2 - do not merge
Change-Id: I35db6befcdfc421da8eb959285e61856c7ed2826
The Android Automerger [Sat, 19 Nov 2011 06:02:22 +0000 (22:02 -0800)]
ICL49B
The Android Automerger [Sat, 19 Nov 2011 06:00:45 +0000 (22:00 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Fri, 18 Nov 2011 23:49:35 +0000 (15:49 -0800)]
Reconcile with ics-mr0-release
Change-Id: I134c060024841405d83b92a700bfe05aeb5d86b5
The Android Automerger [Fri, 18 Nov 2011 23:38:37 +0000 (15:38 -0800)]
ICL49
The Android Automerger [Fri, 18 Nov 2011 23:36:30 +0000 (15:36 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Fri, 18 Nov 2011 21:12:21 +0000 (13:12 -0800)]
Reconcile with ics-mr0-release
Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834
The Android Automerger [Fri, 18 Nov 2011 20:45:55 +0000 (12:45 -0800)]
IML48C
Svetoslav Ganov [Fri, 18 Nov 2011 18:11:28 +0000 (10:11 -0800)]
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
The Android Automerger [Fri, 18 Nov 2011 01:50:39 +0000 (17:50 -0800)]
ICL48B
The Android Automerger [Fri, 18 Nov 2011 01:47:41 +0000 (17:47 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 18 Nov 2011 00:41:53 +0000 (16:41 -0800)]
IML48B
The Android Open Source Project [Thu, 17 Nov 2011 23:36:45 +0000 (15:36 -0800)]
Reconcile with ics-mr0-release
Change-Id: I42fcd347d98058118f225dedd011cb2fac76bbb6
Svetoslav Ganov [Thu, 17 Nov 2011 23:13:49 +0000 (15:13 -0800)]
Add the support libraries to the platform documentation (build).
Added path to the support libraries.
bug:
5629339
Change-Id: Id414597046c528617313881ea857134512d1c2ba
The Android Automerger [Thu, 17 Nov 2011 14:48:58 +0000 (06:48 -0800)]
IML48
The Android Automerger [Thu, 17 Nov 2011 14:45:32 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:29:27 +0000 (06:29 -0800)]
ICL48
The Android Automerger [Thu, 17 Nov 2011 14:27:12 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 17 Nov 2011 00:29:26 +0000 (16:29 -0800)]
IML47B
The Android Open Source Project [Wed, 16 Nov 2011 17:10:21 +0000 (09:10 -0800)]
No-op merge from ics-mr0
Change-Id: Ibbdd04c5626976293b9e6170e9e1f844cb6582a5
The Android Open Source Project [Wed, 16 Nov 2011 16:55:32 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: I2059be2fb54d852023cb4e4b96493ff6a934ffe0
The Android Open Source Project [Wed, 16 Nov 2011 15:33:52 +0000 (07:33 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I76232373a2c25c0e18c27672ede2bb1b281e43f6
The Android Automerger [Wed, 16 Nov 2011 14:48:43 +0000 (06:48 -0800)]
IML47
The Android Automerger [Wed, 16 Nov 2011 14:45:23 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 16 Nov 2011 14:28:22 +0000 (06:28 -0800)]
ICL47
The Android Automerger [Wed, 16 Nov 2011 14:27:06 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 16 Nov 2011 03:09:18 +0000 (19:09 -0800)]
ICL46B
The Android Automerger [Wed, 16 Nov 2011 03:07:30 +0000 (19:07 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 16 Nov 2011 00:19:56 +0000 (16:19 -0800)]
IML46B
The Android Automerger [Tue, 15 Nov 2011 14:47:51 +0000 (06:47 -0800)]
IML46
The Android Automerger [Tue, 15 Nov 2011 14:45:15 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 15 Nov 2011 14:28:19 +0000 (06:28 -0800)]
ICL46
The Android Automerger [Tue, 15 Nov 2011 14:27:08 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 15 Nov 2011 01:14:35 +0000 (17:14 -0800)]
ICL45B
The Android Automerger [Tue, 15 Nov 2011 01:10:28 +0000 (17:10 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 15 Nov 2011 00:00:14 +0000 (16:00 -0800)]
IML45B
The Android Automerger [Mon, 14 Nov 2011 14:47:12 +0000 (06:47 -0800)]
IML45
The Android Automerger [Mon, 14 Nov 2011 14:45:11 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 14 Nov 2011 14:28:30 +0000 (06:28 -0800)]
ICL45
The Android Automerger [Mon, 14 Nov 2011 14:27:06 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 13 Nov 2011 14:49:16 +0000 (06:49 -0800)]
IML44
The Android Automerger [Sun, 13 Nov 2011 14:45:29 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 13 Nov 2011 14:28:49 +0000 (06:28 -0800)]
ICL44
The Android Automerger [Sun, 13 Nov 2011 14:27:17 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Doug Zongker [Sat, 12 Nov 2011 03:17:24 +0000 (19:17 -0800)]
am
a5f534df: use frozensets to represent APK cert sets
* commit '
a5f534df07a598f3fc9d353a1a9a0ff6c09cfbc0':
use frozensets to represent APK cert sets
The Android Automerger [Sat, 12 Nov 2011 03:08:23 +0000 (19:08 -0800)]
ITL41D
The Android Automerger [Sat, 12 Nov 2011 02:47:45 +0000 (18:47 -0800)]
ICL42C
The Android Automerger [Sat, 12 Nov 2011 02:33:07 +0000 (18:33 -0800)]
ICL42B
The Android Automerger [Fri, 11 Nov 2011 22:47:46 +0000 (14:47 -0800)]
ICL42
OSDN Git Service
