git.osdn.net Git - android-x86/build.git/log

OSDN Git Service

(root) / android-x86 / build.git / log

commit | commitdiff | tree

Dianne Hackborn [Wed, 7 Dec 2011 18:46:20 +0000 (10:46 -0800)]

resolved conflicts for merge of d7b15982 to master

Change-Id: Iaa744477dd64e9833888f72186ec0676e99f28e4

commit | commitdiff | tree

Dianne Hackborn [Wed, 7 Dec 2011 18:34:21 +0000 (10:34 -0800)]

am e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.

* commit 'e73b24ccbe728476e5bc77aaf2fd6865276cacc3':
Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Wed, 7 Dec 2011 15:44:22 +0000 (07:44 -0800)]

Reconcile with ics-mr1-release

Change-Id: Ib6c72245d2135fe255c5dada01754cb5e03d761c

commit | commitdiff | tree

The Android Open Source Project [Wed, 7 Dec 2011 15:27:54 +0000 (07:27 -0800)]

am e3bdf69c: am febd861a: Reconcile with ics-mr0-release

* commit 'e3bdf69cc6af9a7deec5a44823e5a0a2e1f16064':
ICL53E

commit | commitdiff | tree

The Android Open Source Project [Wed, 7 Dec 2011 15:26:16 +0000 (07:26 -0800)]

am febd861a: Reconcile with ics-mr0-release

* commit 'febd861a073b0500b6e7f0ea117b71df3bc6822c':
ICL53E

commit | commitdiff | tree

The Android Open Source Project [Wed, 7 Dec 2011 15:24:51 +0000 (07:24 -0800)]

Reconcile with ics-mr0-release

Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 7 Dec 2011 06:53:45 +0000 (22:53 -0800)]

am 0cd997ff: am 8af0efd6: Improve handling of absolute paths in out directory

* commit '0cd997ff31852af80eab4f3d0c2db8d1a1328085':
Improve handling of absolute paths in out directory

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 7 Dec 2011 06:53:44 +0000 (22:53 -0800)]

am 78b68045: am ffe03c98: Set OUT_DIR based on a common base path

* commit '78b680458b3ba53fb2f88a603e371c002eb8944b':
Set OUT_DIR based on a common base path

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 7 Dec 2011 03:32:38 +0000 (19:32 -0800)]

am 8af0efd6: Improve handling of absolute paths in out directory

* commit '8af0efd6a157e682d88c9a6e030f37bab9860caf':
Improve handling of absolute paths in out directory

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Wed, 7 Dec 2011 00:56:46 +0000 (16:56 -0800)]

IML67

commit | commitdiff | tree

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

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 7 Dec 2011 00:32:40 +0000 (16:32 -0800)]

Improve handling of absolute paths in out directory

Change-Id: If6b320e274fb1cee33808424246ce2c88b9b7ef5

commit | commitdiff | tree

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>

commit | commitdiff | tree

The Android Automerger [Tue, 6 Dec 2011 22:23:43 +0000 (14:23 -0800)]

ICL53E

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Dec 2011 17:02:50 +0000 (09:02 -0800)]

Reconcile with ics-mr1-release

Change-Id: Ib87b7762bfc1eca5386bfc50c687547c6141dc29

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Dec 2011 17:00:17 +0000 (09:00 -0800)]

am da4a1fc2: am aac7b445: Reconcile with ics-mr0-release

* commit 'da4a1fc216429a44c1befaf27f73350af2527a67':
ICL53D

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Dec 2011 16:56:01 +0000 (08:56 -0800)]

Reconcile with ics-mr0-release

Change-Id: I224ac8e665f91c64935f7a20397b925aba767994

commit | commitdiff | tree

The Android Automerger [Tue, 6 Dec 2011 13:23:26 +0000 (05:23 -0800)]

ICL53D

commit | commitdiff | tree

The Android Automerger [Tue, 6 Dec 2011 04:38:05 +0000 (20:38 -0800)]

IML66

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Mon, 5 Dec 2011 16:52:52 +0000 (08:52 -0800)]

Reconcile with ics-mr1-release

Change-Id: Ia3ed1074e701cb1a74e3af1906ef3897fc293fd0

commit | commitdiff | tree

Doug Zongker [Sat, 3 Dec 2011 01:57:22 +0000 (17:57 -0800)]

am 4eef1296: am bd2dadc2: check entire recovery partition on startup

* commit '4eef12965b5dc39ba87eb71ac3548cc2ec8af729':
check entire recovery partition on startup

commit | commitdiff | tree

The Android Automerger [Sat, 3 Dec 2011 00:23:13 +0000 (16:23 -0800)]

IML63B

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Doug Zongker [Fri, 2 Dec 2011 21:39:33 +0000 (13:39 -0800)]

Merge "check entire recovery partition on startup"

commit | commitdiff | tree

Doug Zongker [Fri, 2 Dec 2011 18:46:59 +0000 (10:46 -0800)]

commit | commitdiff | tree

Ying Wang [Fri, 2 Dec 2011 18:34:45 +0000 (10:34 -0800)]

Print more info of the image size stats.

Bug: 5620615
Before this change it only reports the limit if the real size exceeeds
or approaches the limit.

Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e

commit | commitdiff | tree

The Android Automerger [Fri, 2 Dec 2011 18:27:28 +0000 (10:27 -0800)]

IML63

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Fri, 2 Dec 2011 15:52:56 +0000 (07:52 -0800)]

Reconcile with ics-mr1-release

Change-Id: I7652f038082b7a8de4a210854f755c3127f3370a

commit | commitdiff | tree

Scott Main [Fri, 2 Dec 2011 04:44:25 +0000 (20:44 -0800)]

am d34204b9: 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

* commit 'd34204b9ec3e79862f5101837ccc6f90909b9850':
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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Fri, 2 Dec 2011 00:47:38 +0000 (16:47 -0800)]

IML62B

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Thu, 1 Dec 2011 14:48:19 +0000 (06:48 -0800)]

IML62

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Thu, 1 Dec 2011 00:59:51 +0000 (16:59 -0800)]

IML61B

commit | commitdiff | tree

Alon Albert [Wed, 30 Nov 2011 21:04:32 +0000 (13:04 -0800)]

Merge "Add support for building specific modules with mmm using the following syntax: Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words:"

commit | commitdiff | tree

The Android Open Source Project [Wed, 30 Nov 2011 20:55:27 +0000 (12:55 -0800)]

Reconcile with ics-mr1-release

Change-Id: I91cfa5357d3530b04123a4faf703598994b2ed5a

commit | commitdiff | tree

Alon Albert [Wed, 30 Nov 2011 20:40:19 +0000 (12:40 -0800)]

Add support for building specific modules with mmm using the following syntax:
Build all modules:       mmm dir
Build a single module:   mmm dir:module
Build multiple modules:  mmm dir:module1,module2
Or in other words:

Change-Id: If32770c19f03a4d460f32046a3dd06656e33ee11

commit | commitdiff | tree

Marius Renn [Wed, 30 Nov 2011 18:51:17 +0000 (10:51 -0800)]

am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1

* commit 'f945235a8adc6b163a0e46941791bb305ef37034':
Google Add-On API Documentation Fixes (5429077)

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 30 Nov 2011 18:51:12 +0000 (10:51 -0800)]

am 8dd412a9: Merge from AOSP

* commit '8dd412a900c73144b0d868e3e872938052071d95':
English must be the first language specified

commit | commitdiff | tree

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)

commit | commitdiff | tree

Marius Renn [Wed, 30 Nov 2011 17:51:17 +0000 (09:51 -0800)]

Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 30 Nov 2011 15:26:18 +0000 (07:26 -0800)]

Merge from AOSP

Change-Id: I992d4a0baefc08e105f76b7e6f6950516047670a

commit | commitdiff | tree

The Android Automerger [Wed, 30 Nov 2011 14:48:37 +0000 (06:48 -0800)]

IML61

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Wed, 30 Nov 2011 01:08:24 +0000 (17:08 -0800)]

IML60C

commit | commitdiff | tree

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>

commit | commitdiff | tree

The Android Automerger [Tue, 29 Nov 2011 23:28:27 +0000 (15:28 -0800)]

IML60B

commit | commitdiff | tree

The Android Automerger [Tue, 29 Nov 2011 20:05:06 +0000 (12:05 -0800)]

IML60

commit | commitdiff | tree

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

commit | commitdiff | tree

Ying Wang [Tue, 29 Nov 2011 19:20:16 +0000 (11:20 -0800)]

Move the prebuilt NDKs to their own git project prebuilts/ndk/.

Change-Id: If85986da436d412cff139af1fd8426e420bec121

commit | commitdiff | tree

Ying Wang [Tue, 29 Nov 2011 18:24:27 +0000 (10:24 -0800)]

Move prebuilt SDKs to their own git project.

Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5

commit | commitdiff | tree

The Android Open Source Project [Tue, 29 Nov 2011 15:58:17 +0000 (07:58 -0800)]

am d719f6a8: am c99c8c08: Reconcile with ics-mr0-release

* commit 'd719f6a81bc285b437c1babd8f8443d115b0833c':
ICL53C

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Tue, 29 Nov 2011 15:54:00 +0000 (07:54 -0800)]

Reconcile with ics-mr0-release

Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5

commit | commitdiff | tree

Tor Norbye [Mon, 28 Nov 2011 23:35:27 +0000 (15:35 -0800)]

am e96a0500: am dc2450ca: Build fix - include sdk/lint in build.

* commit 'e96a0500b442f2f9359acae98de9f56719b63592':
Build fix - include sdk/lint in build.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Tor Norbye [Fri, 21 Oct 2011 02:18:15 +0000 (19:18 -0700)]

Build fix - include sdk/lint in build.

commit | commitdiff | tree

Ben Cheng [Mon, 28 Nov 2011 22:57:21 +0000 (14:57 -0800)]

Merge "Point OPROFILE_EVENTS_DIR to oprofile dir in source tree."

commit | commitdiff | tree

Ben Cheng [Mon, 28 Nov 2011 21:55:14 +0000 (13:55 -0800)]

Point OPROFILE_EVENTS_DIR to oprofile dir in source tree.

Otherwise oprofile will punt with the following error message when
processing results collected by perf events since the event descriptions
are not stored in the default location on the host.

profile: could not open unit mask description file
/usr/local/share/oprofile//arm/armv7/unit_masks

Change-Id: I4ff2f2a87546ed3606490596285fb3e466e8d661

commit | commitdiff | tree

Tor Norbye [Mon, 28 Nov 2011 22:28:32 +0000 (14:28 -0800)]

am d6c8cafd: (-s ours) am 3997910e: am 5dd51bde: Build fix - include sdk/lint in build. do not merge.

* commit 'd6c8cafdacab939a5f8581afa15377a6449a8058':
Build fix - include sdk/lint in build. do not merge.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Mon, 28 Nov 2011 20:25:45 +0000 (12:25 -0800)]

IML59

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Sat, 26 Nov 2011 20:29:48 +0000 (12:29 -0800)]

ICL53C

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Wed, 23 Nov 2011 18:34:27 +0000 (10:34 -0800)]

am b5acb8b4: am 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit 'b5acb8b45904ae5cc17de847c4036d3f6146847c':
ITL41G
ICL53B

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Wed, 23 Nov 2011 05:50:14 +0000 (21:50 -0800)]

ITL41G

commit | commitdiff | tree

The Android Automerger [Wed, 23 Nov 2011 00:14:07 +0000 (16:14 -0800)]

ICL53B

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Tue, 22 Nov 2011 23:28:03 +0000 (15:28 -0800)]

am 330875fd: am 24215999: Reconcile with ics-mr0-release

* commit '330875fdcf830db62a46ceb9bc0e0c3d9f67b775':

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Tue, 22 Nov 2011 23:23:59 +0000 (15:23 -0800)]

Reconcile with ics-mr0-release

Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc

commit | commitdiff | tree

The Android Open Source Project [Tue, 22 Nov 2011 23:15:38 +0000 (15:15 -0800)]

Reconcile with ics-mr0-release

Change-Id: Icd071d37f41bb60a49fd88195b433b95733da769

commit | commitdiff | tree

The Android Automerger [Tue, 22 Nov 2011 22:29:10 +0000 (14:29 -0800)]

ICL53

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Tue, 22 Nov 2011 21:25:31 +0000 (13:25 -0800)]

Reconcile with ics-mr1-release

Change-Id: If09ddcaa675b12a1d92a48f2c7ce7c315482f43f

commit | commitdiff | tree

The Android Open Source Project [Tue, 22 Nov 2011 21:24:05 +0000 (13:24 -0800)]

am 43583c1a: am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '43583c1a4431d4c237a86ce2a65465706a4a5078':
  ITL41F
  ITL41E
  ICL52
  ICL49B

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 22 Nov 2011 20:42:02 +0000 (12:42 -0800)]

am 6b95f9b0: Ignore version numbers from AOSP

* commit '6b95f9b002c819a35ce68ce930007618e2f30ff7':
Restore AOSP-specific pseudo-version-numbers.

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 22 Nov 2011 20:29:17 +0000 (12:29 -0800)]

Ignore version numbers from AOSP

Change-Id: I971716e56ec5649013ba50c6bb385329074be40b

commit | commitdiff | tree

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