OSDN Git Service
Jean-Baptiste Queru [Wed, 7 Dec 2011 03:32:37 +0000 (19:32 -0800)]
am
ffe03c98: Set OUT_DIR based on a common base path
* commit '
ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
Set OUT_DIR based on a common base path
Jean-Baptiste Queru [Tue, 6 Dec 2011 18:29:46 +0000 (10:29 -0800)]
Set OUT_DIR based on a common base path
Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
The Android Open Source Project [Tue, 6 Dec 2011 16:57:52 +0000 (08:57 -0800)]
am
aac7b445: Reconcile with ics-mr0-release
* commit '
aac7b4455a4dbfab5a136628864789eba8a31bb0':
ICL53D
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
Doug Zongker [Fri, 2 Dec 2011 21:58:08 +0000 (13:58 -0800)]
am
bd2dadc2: check entire recovery partition on startup
* commit '
bd2dadc21a5db967972a7b8f81aad716609edacb':
check entire recovery partition on startup
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
Scott Main [Fri, 2 Dec 2011 04:42:55 +0000 (20:42 -0800)]
am
b83d8f15: 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/
* commit '
b83d8f15ccc276b190a6c02002f6af94aa2e9cb4':
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: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
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
Marius Renn [Wed, 30 Nov 2011 17:53:05 +0000 (09:53 -0800)]
am
72db32c7: Merge "Google Add-On API Documentation Fixes (
5429077)" into ics-mr1
* commit '
72db32c744744ae1ace26830ecce968b6a95e173':
Google Add-On API Documentation Fixes (
5429077)
Marius Renn [Wed, 30 Nov 2011 17:51:17 +0000 (09:51 -0800)]
Merge "Google Add-On API Documentation Fixes (
5429077)" into ics-mr1
Jean-Baptiste Queru [Wed, 30 Nov 2011 15:26:18 +0000 (07:26 -0800)]
Merge from AOSP
Change-Id: I992d4a0baefc08e105f76b7e6f6950516047670a
Bruce Beare [Mon, 21 Nov 2011 23:52:43 +0000 (15:52 -0800)]
English must be the first language specified
The first language specified in PRODUCT_LOCALS is the default.
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
The Android Open Source Project [Tue, 29 Nov 2011 15:56:23 +0000 (07:56 -0800)]
am
c99c8c08: Reconcile with ics-mr0-release
* commit '
c99c8c081467085c548edf03cbc1500ba3852b44':
ICL53C
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 23:33:45 +0000 (15:33 -0800)]
am
dc2450ca: Build fix - include sdk/lint in build.
* commit '
dc2450ca25d1169a42dbe9de127b730718bc0eb9':
Build fix - include sdk/lint in build.
Tor Norbye [Fri, 21 Oct 2011 02:18:15 +0000 (19:18 -0700)]
Build fix - include sdk/lint in build.
Tor Norbye [Mon, 28 Nov 2011 22:26:41 +0000 (14:26 -0800)]
am
3997910e: am
5dd51bde: Build fix - include sdk/lint in build. do not merge.
* commit '
3997910eeaff5a605f2f2968dd0c617dcd10183d':
Build fix - include sdk/lint in build. do not merge.
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 [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:24:44 +0000 (09:24 -0800)]
am
070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
070e712fb3037b28e81340eb2e4fb53d1539130d':
ITL41G
ICL53B
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:26:13 +0000 (15:26 -0800)]
am
24215999: Reconcile with ics-mr0-release
* commit '
24215999d0a9d603aeea3c88ceedfb8e36fcf947':
ICL53
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:22:23 +0000 (13:22 -0800)]
am
5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
5cd44bd38f4d2158758a97e8a871a3b9cd6b6b37':
ITL41F
ITL41E
ICL52
ICL49B
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
Jean-Baptiste Queru [Tue, 22 Nov 2011 20:29:17 +0000 (12:29 -0800)]
Ignore version numbers from AOSP
Change-Id: I971716e56ec5649013ba50c6bb385329074be40b
Jean-Baptiste Queru [Tue, 22 Nov 2011 20:21:00 +0000 (12:21 -0800)]
Restore AOSP-specific pseudo-version-numbers.
For great justice.
Change-Id: I5a0f722419bff676142ce975a66225f0cd418ff8
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 16:31:56 +0000 (08:31 -0800)]
am
bb0e59be: resolved conflicts for merge of
aca203ff to ics-mr1
* commit '
bb0e59be7c01fd9eb85d81b92c0527bac5402d1d':
ICS MR0.1 will be version 4.0.2 - do not merge
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:51:28 +0000 (15:51 -0800)]
am
1ca1730b: Reconcile with ics-mr0-release
* commit '
1ca1730b88e45d39c9211793d133cae148b134a1':
ICL49
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:35:29 +0000 (13:35 -0800)]
am
409670e9: Reconcile with ics-mr0-release
* commit '
409670e9fa4131bed57a292b3a25180e4ac0709e':
ICL48B
The Android Open Source Project [Fri, 18 Nov 2011 21:12:21 +0000 (13:12 -0800)]
Reconcile with ics-mr0-release
Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834
Svetoslav Ganov [Fri, 18 Nov 2011 18:14:02 +0000 (10:14 -0800)]
am
700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '
700b18cc72e75737fa5cf79896c98f12003b7735':
Add the support libraries to the platform documentation (build).
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 Open Source Project [Thu, 17 Nov 2011 23:39:14 +0000 (15:39 -0800)]
am
77b2771b: Reconcile with ics-mr0-release
* commit '
77b2771bd2bc26aefdf9ff3a3d96b54799185917':
ICL48
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: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 Open Source Project [Wed, 16 Nov 2011 17:13:28 +0000 (09:13 -0800)]
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:38:07 +0000 (07:38 -0800)]
am
88eff0cb: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
88eff0cb509bdd824c542b52880d9e93db4444a0':
ICL47
ICL46B
ICL46
ICL45B
ICL45
ICL44
ITL41D
ICL42C
ICL42B
ICL42
ITL41C
ITL41B
ITL41
ICL41
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: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 [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 [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: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
Erik Gilling [Sat, 12 Nov 2011 04:35:06 +0000 (20:35 -0800)]
Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/build into ics-mr1-plus-aosp
Doug Zongker [Sat, 12 Nov 2011 04:34:47 +0000 (20:34 -0800)]
am
4a84a13e: am
a5f534df: use frozensets to represent APK cert sets
* commit '
4a84a13e7ce65f24bcadb8d331023b6415d7867e':
use frozensets to represent APK cert sets
Jean-Baptiste Queru [Sat, 12 Nov 2011 04:34:37 +0000 (20:34 -0800)]
am
1623f79c: Merge from ics-mr0
* commit '
1623f79c7561b19f57c10ac303f6246deee7c634':
use frozensets to represent APK cert sets
Jean-Baptiste Queru [Sat, 12 Nov 2011 03:47:34 +0000 (19:47 -0800)]
Merge from ics-mr0
Change-Id: I5667c315fab589a2dc39e000a81397d317691895
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 Open Source Project [Sat, 12 Nov 2011 00:06:02 +0000 (16:06 -0800)]
am
324c814c: Merge from AOSP
* commit '
324c814c6f479bb33eb8aa05d221c8a44b8f61b9':
Add a hash-bang as the first line of a shell script
The Android Open Source Project [Sat, 12 Nov 2011 00:03:39 +0000 (16:03 -0800)]
Merge from AOSP
Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
The Android Automerger [Fri, 11 Nov 2011 22:47:46 +0000 (14:47 -0800)]
ICL42
The Android Automerger [Fri, 11 Nov 2011 22:45:37 +0000 (14:45 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Jean-Baptiste Queru [Fri, 11 Nov 2011 22:31:18 +0000 (14:31 -0800)]
Add a hash-bang as the first line of a shell script
Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
Ying Wang [Fri, 11 Nov 2011 22:36:39 +0000 (14:36 -0800)]
am
a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit '
a032d3d07372423176e072dfcbcf60a53f8a7d57':
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
The Android Open Source Project [Fri, 11 Nov 2011 19:47:50 +0000 (11:47 -0800)]
Ying Wang [Fri, 11 Nov 2011 18:52:12 +0000 (10:52 -0800)]
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug:
5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
Doug Zongker [Fri, 11 Nov 2011 17:51:37 +0000 (09:51 -0800)]
use frozensets to represent APK cert sets
Change-Id: Ic92c83be0c3f6a76bf1bd21f0216cd1b87586959
The Android Automerger [Fri, 11 Nov 2011 07:41:40 +0000 (23:41 -0800)]
ITL41C
The Android Open Source Project [Fri, 11 Nov 2011 02:26:35 +0000 (18:26 -0800)]
Merge from ics-mr0
Change-Id: I759452c031b9e2f02905dd488b61f100e3eaa87a
The Android Automerger [Fri, 11 Nov 2011 01:27:13 +0000 (17:27 -0800)]
ITL41B
The Android Automerger [Fri, 11 Nov 2011 01:22:24 +0000 (17:22 -0800)]
ITL41
Jim Huang [Thu, 10 Nov 2011 21:34:23 +0000 (21:34 +0000)]
am
cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit '
cb48497ff2f84e8f7def981246ddc028ea126879':
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
OSDN Git Service
