OSDN Git Service

android-x86/build.git
11 years agoam f44a518c: am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
Ying Wang [Tue, 27 Nov 2012 22:18:53 +0000 (14:18 -0800)]
am f44a518c: am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH

* commit 'f44a518c104b706c752b671b0308716c7cca73d5':
  Put ANDROID_BUILD_PATHS before the system default PATH

11 years agoam c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
Ying Wang [Tue, 27 Nov 2012 22:17:27 +0000 (14:17 -0800)]
am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH

* commit 'c69b773506ecf2316059a9fe947bbeb524a402b3':
  Put ANDROID_BUILD_PATHS before the system default PATH

11 years agoPut ANDROID_BUILD_PATHS before the system default PATH
Ying Wang [Tue, 27 Nov 2012 04:51:59 +0000 (20:51 -0800)]
Put ANDROID_BUILD_PATHS before the system default PATH

So tools like adb that are built from source won't be overridden by the
host system tools, when you run these tools without specifying the path.

Change-Id: I2f0a288b38fabf57c7a4aa3bae5e42d7b734398d

11 years agoam d4f8d5e6: replace dummy versions with normal ones for mini
Keun young Park [Tue, 27 Nov 2012 19:31:50 +0000 (11:31 -0800)]
am d4f8d5e6: replace dummy versions with normal ones for mini

* commit 'd4f8d5e64950eb114993a9de975e1519e3509d43':
  replace dummy versions with normal ones for mini

11 years agoam 257fef43: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 27 Nov 2012 19:31:33 +0000 (11:31 -0800)]
am 257fef43: Reconcile with jb-mr1-release - do not merge

* commit '257fef430806408dbaca2708018b144d430fbdef':
  bump version to 4.2.1
  JOP40D

11 years agoreplace dummy versions with normal ones for mini
Keun young Park [Tue, 27 Nov 2012 18:52:14 +0000 (10:52 -0800)]
replace dummy versions with normal ones for mini

- no need to hide these UIs any more.
- dummy versions will be removed from the default manifest as well.

Change-Id: I7cebf5bfae65d2e50c9122735fd4e537f5858bec

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 27 Nov 2012 15:33:15 +0000 (07:33 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911

11 years agobump version to 4.2.1
Ed Heyl [Mon, 19 Nov 2012 22:20:48 +0000 (14:20 -0800)]
bump version to 4.2.1

Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4

11 years agoJOP40D
The Android Automerger [Tue, 20 Nov 2012 00:03:54 +0000 (16:03 -0800)]
JOP40D

11 years agoam 0ddeb0cc: am efcc8b1c: bump version to 4.2.1
Ed Heyl [Mon, 19 Nov 2012 22:29:37 +0000 (14:29 -0800)]
am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1

* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
  bump version to 4.2.1

11 years agoam efcc8b1c: bump version to 4.2.1
Ed Heyl [Mon, 19 Nov 2012 22:26:49 +0000 (14:26 -0800)]
am efcc8b1c: bump version to 4.2.1

* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
  bump version to 4.2.1

11 years agobump version to 4.2.1
Ed Heyl [Mon, 19 Nov 2012 22:20:48 +0000 (14:20 -0800)]
bump version to 4.2.1

Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4

11 years agoam 6a040270: am 34a4b823: Merge "docs: revise message when api level for docs is...
Scott Main [Fri, 16 Nov 2012 18:48:50 +0000 (10:48 -0800)]
am 6a040270: am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev

* commit '6a0402701ee9672ef57f3049c3e6d7f5c01095b6':
  docs: revise message when api level for docs is too low; make the message appear on package pages as well

11 years agoam 34a4b823: Merge "docs: revise message when api level for docs is too low; make...
Scott Main [Fri, 16 Nov 2012 18:45:44 +0000 (10:45 -0800)]
am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev

* commit '34a4b8239e25103eb796dabd046d821942706b9f':
  docs: revise message when api level for docs is too low; make the message appear on package pages as well

11 years agoMerge "docs: revise message when api level for docs is too low; make the message...
Scott Main [Fri, 16 Nov 2012 18:43:23 +0000 (10:43 -0800)]
Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev

11 years agodocs: revise message when api level for docs is too low;
Scott Main [Fri, 16 Nov 2012 18:34:22 +0000 (10:34 -0800)]
docs: revise message when api level for docs is too low;
make the message appear on package pages as well

Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2

11 years agoam f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1
Guang Zhu [Fri, 16 Nov 2012 01:57:58 +0000 (17:57 -0800)]
am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1

* commit 'f0d4d8f32934df6dc859e2b668d436d67b388cd2':
  DO NOT MERGE: change build id to JB MR1.1

11 years agoDO NOT MERGE: change build id to JB MR1.1
Guang Zhu [Fri, 16 Nov 2012 01:47:53 +0000 (17:47 -0800)]
DO NOT MERGE: change build id to JB MR1.1

Among other things, this helps monitoring of automated tests, to
properly show which branch the device is running on

Change-Id: I8bb8e3ec347849da44d29ce502b09a593d61ae0e

11 years agoam 1f0850ee: am 11ac05bb: docs: add script for 32/64-bit bundle downloads
Scott Main [Thu, 15 Nov 2012 23:23:43 +0000 (15:23 -0800)]
am 1f0850ee: am 11ac05bb: docs: add script for 32/64-bit bundle downloads

* commit '1f0850ee04dcb54e0969f40f692ae00f1da5843b':
  docs: add script for 32/64-bit bundle downloads

11 years agoam 11ac05bb: docs: add script for 32/64-bit bundle downloads
Scott Main [Thu, 15 Nov 2012 23:21:00 +0000 (15:21 -0800)]
am 11ac05bb: docs: add script for 32/64-bit bundle downloads

* commit '11ac05bb015c4097f828b0907a0835f7d546738c':
  docs: add script for 32/64-bit bundle downloads

11 years agoam ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
Ying Wang [Thu, 15 Nov 2012 23:20:58 +0000 (15:20 -0800)]
am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev

* commit 'ce811261bc8d56d43e59b1f9fb96ae53192de126':
  Move check-api to definition.mk

11 years agodocs: add script for 32/64-bit bundle downloads
Scott Main [Thu, 15 Nov 2012 22:57:44 +0000 (14:57 -0800)]
docs: add script for 32/64-bit bundle downloads

Change-Id: I502e4ced8ac30cc19bf321e7a586f28244bf1294

11 years agoMerge "Move check-api to definition.mk" into jb-mr1.1-dev
Ying Wang [Thu, 15 Nov 2012 23:17:42 +0000 (15:17 -0800)]
Merge "Move check-api to definition.mk" into jb-mr1.1-dev

11 years agoam 2dc85a0f: am 83cd28b3: am 9efb6b09: am be264b6d: am 5a1123ef: add script to genera...
Scott Main [Thu, 15 Nov 2012 01:44:57 +0000 (17:44 -0800)]
am 2dc85a0f: am 83cd28b3: am 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page

* commit '2dc85a0fe0a9a01843b74945aeda9195e44869c2':
  add script to generate list of classes for each training course landing page

11 years agoam 83cd28b3: am 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of...
Scott Main [Thu, 15 Nov 2012 01:42:20 +0000 (17:42 -0800)]
am 83cd28b3: am 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page

* commit '83cd28b354e222e5ca78b17229fa456e40d8c900':
  add script to generate list of classes for each training course landing page

11 years agoam 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of classes for...
Scott Main [Thu, 15 Nov 2012 01:40:58 +0000 (17:40 -0800)]
am 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page

* commit '9efb6b09c4a32cc5cd190a224d15022968859ddb':
  add script to generate list of classes for each training course landing page

11 years agoam be264b6d: am 5a1123ef: add script to generate list of classes for each training...
Scott Main [Thu, 15 Nov 2012 01:39:42 +0000 (17:39 -0800)]
am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page

* commit 'be264b6da6631b8c7d526fc3dc76a6ddbb881fee':
  add script to generate list of classes for each training course landing page

11 years agoam 5a1123ef: add script to generate list of classes for each training course landing...
Scott Main [Thu, 15 Nov 2012 01:38:11 +0000 (17:38 -0800)]
am 5a1123ef: add script to generate list of classes for each training course landing page

* commit '5a1123ef7a43c007ff4cfb6c04d3f9dc5436f1c6':
  add script to generate list of classes for each training course landing page

11 years agoadd script to generate list of classes for each training course landing page
Scott Main [Wed, 26 Sep 2012 19:51:28 +0000 (12:51 -0700)]
add script to generate list of classes for each training course landing page

Change-Id: Ieac8a97a8d6fda41a3682241901150cfe16afc4d

11 years agoMove check-api to definition.mk
Ying Wang [Wed, 14 Nov 2012 23:57:07 +0000 (15:57 -0800)]
Move check-api to definition.mk

1) Move check-api to definition.mk, so it can be used in other places.
2) Add additional dependency to the api-stub module to consolidate the
apicheck dependency. Previously you have to run 2 "make"s in a row and
only in the 2nd run apicheck is run, due to a gnu-make optimization.

Bug: 7540265
Change-Id: Ib24ed87d9330027a9f95ed7b16dd4002cc0e3198

11 years agoam 912ed02b: am 7c05b69c: docs: add warning message for adt when on 32-bit os
Scott Main [Wed, 14 Nov 2012 23:15:25 +0000 (15:15 -0800)]
am 912ed02b: am 7c05b69c: docs: add warning message for adt when on 32-bit os

* commit '912ed02b53c1c656df1b92a6a2518f48b8be9832':
  docs: add warning message for adt when on 32-bit os

11 years agoam 7c05b69c: docs: add warning message for adt when on 32-bit os
Scott Main [Wed, 14 Nov 2012 23:13:25 +0000 (15:13 -0800)]
am 7c05b69c: docs: add warning message for adt when on 32-bit os

* commit '7c05b69c0c985bd2f57caec9143710a2204317b8':
  docs: add warning message for adt when on 32-bit os

11 years agodocs: add warning message for adt when on 32-bit os
Scott Main [Wed, 14 Nov 2012 22:12:29 +0000 (14:12 -0800)]
docs: add warning message for adt when on 32-bit os

Change-Id: I457a219bb1f9e07d6b94084c69c56309568a4881

11 years agoam 4e9b723f: am 098d8dea: docs: add support for ndk tos wall
Scott Main [Tue, 13 Nov 2012 19:44:46 +0000 (11:44 -0800)]
am 4e9b723f: am 098d8dea: docs: add support for ndk tos wall

* commit '4e9b723f694b4713bdc30e8019b82b43b1217bae':
  docs: add support for ndk tos wall

11 years agoam 098d8dea: docs: add support for ndk tos wall
Scott Main [Tue, 13 Nov 2012 19:42:50 +0000 (11:42 -0800)]
am 098d8dea: docs: add support for ndk tos wall

* commit '098d8deaefaf6f834db86c15999d2aedd038d272':
  docs: add support for ndk tos wall

11 years agodocs: add support for ndk tos wall
Scott Main [Tue, 13 Nov 2012 19:25:06 +0000 (11:25 -0800)]
docs: add support for ndk tos wall

Change-Id: Ife49429b8241f4e9ce5aaa9f6494d52014a3f238

11 years agoam 3894b39e: am df0e1617: docs: css fix
Scott Main [Tue, 13 Nov 2012 15:56:55 +0000 (07:56 -0800)]
am 3894b39e: am df0e1617: docs: css fix

* commit '3894b39ec39d0ae1ba165753fb50373db4bd8077':
  docs: css fix

11 years agoam 6f4d588f: am e0c11a6f: docs: fix broken template
Scott Main [Tue, 13 Nov 2012 15:55:32 +0000 (07:55 -0800)]
am 6f4d588f: am e0c11a6f: docs: fix broken template

* commit '6f4d588faa0cef536970f1a227c0f1b41eced1e7':
  docs: fix broken template

11 years agoam df0e1617: docs: css fix
Scott Main [Tue, 13 Nov 2012 15:55:09 +0000 (07:55 -0800)]
am df0e1617: docs: css fix

* commit 'df0e161703de693dd6a837c56be810a9e29e7d3c':
  docs: css fix

11 years agoam e0c11a6f: docs: fix broken template
Scott Main [Tue, 13 Nov 2012 15:52:42 +0000 (07:52 -0800)]
am e0c11a6f: docs: fix broken template

* commit 'e0c11a6f9ae9345da7109c4b08d26778e8265520':
  docs: fix broken template

11 years agodocs: css fix
Scott Main [Tue, 13 Nov 2012 15:52:20 +0000 (07:52 -0800)]
docs: css fix

Change-Id: Ie03e7708866fd2e97347ee10f3a40b2f77b0a803

11 years agoam f528f430: am bbffb4bf: docs: add support for templated tabs with the doc title
Scott Main [Tue, 13 Nov 2012 15:48:39 +0000 (07:48 -0800)]
am f528f430: am bbffb4bf: docs: add support for templated tabs with the doc title

* commit 'f528f4307df61565ec70cc59776949f1b826878a':
  docs: add support for templated tabs with the doc title

11 years agodocs: fix broken template
Scott Main [Tue, 13 Nov 2012 15:47:50 +0000 (07:47 -0800)]
docs: fix broken template

Change-Id: Ibb804bcf8851cdb15cf6c98dff25a3a391eb8301

11 years agoam bbffb4bf: docs: add support for templated tabs with the doc title
Scott Main [Tue, 13 Nov 2012 15:46:45 +0000 (07:46 -0800)]
am bbffb4bf: docs: add support for templated tabs with the doc title

* commit 'bbffb4bfb48eb0adb7dc827594f41428f8ffcc19':
  docs: add support for templated tabs with the doc title

11 years agodocs: add support for templated tabs with the doc title
Scott Main [Tue, 13 Nov 2012 15:40:16 +0000 (07:40 -0800)]
docs: add support for templated tabs with the doc title

Change-Id: I820a2704d21c94a9a452854a46ea88749d8274d0

11 years agoam 896f9ec9: am 705e8a4f: docs: something whatever
Scott Main [Tue, 13 Nov 2012 14:25:23 +0000 (06:25 -0800)]
am 896f9ec9: am 705e8a4f: docs: something whatever

* commit '896f9ec991a9d92f0a35129347ec1cb85661880c':
  docs: something whatever

11 years agoam 705e8a4f: docs: something whatever
Scott Main [Tue, 13 Nov 2012 14:22:26 +0000 (06:22 -0800)]
am 705e8a4f: docs: something whatever

* commit '705e8a4f6100486dbcf1530490e9761c1afa1a6e':
  docs: something whatever

11 years agodocs: something whatever
Scott Main [Tue, 13 Nov 2012 13:36:12 +0000 (05:36 -0800)]
docs: something whatever

Change-Id: I08120f1e27a488dfec03868758ab6de2e75fdc09

11 years agoam deac4de5: am 55d99832: docs: changes to sdk page and script for toggles
Scott Main [Tue, 13 Nov 2012 10:32:41 +0000 (02:32 -0800)]
am deac4de5: am 55d99832: docs: changes to sdk page and script for toggles

* commit 'deac4de56e3cdddabeeb6d4f8d4aea9e34ab11e3':
  docs: changes to sdk page and script for toggles

11 years agoam 55d99832: docs: changes to sdk page and script for toggles
Scott Main [Tue, 13 Nov 2012 10:29:52 +0000 (02:29 -0800)]
am 55d99832: docs: changes to sdk page and script for toggles

* commit '55d99832fd2631bc9453141ae3a23e2eb074ede0':
  docs: changes to sdk page and script for toggles

11 years agodocs: changes to sdk page and script for toggles
Scott Main [Tue, 13 Nov 2012 07:03:59 +0000 (23:03 -0800)]
docs: changes to sdk page and script for toggles

Change-Id: Idef0c6099885cada3a4866ed7b5ec5b6f5078e39

11 years agoam 0a6deb1c: am 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to...
Scott Main [Tue, 13 Nov 2012 02:11:01 +0000 (18:11 -0800)]
am 0a6deb1c: am 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page

* commit '0a6deb1c69fc9f557330cde804dea3ff82fdf74f':
  add ADT Bundle to the download page

11 years agoam 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download...
Scott Main [Tue, 13 Nov 2012 02:09:21 +0000 (18:09 -0800)]
am 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page

* commit '8fa72222419fa0a94509e507f4450c941313590d':
  add ADT Bundle to the download page

11 years agoam 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
Scott Main [Tue, 13 Nov 2012 02:07:58 +0000 (18:07 -0800)]
am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page

* commit '2953f0b0b1fcd350ff269b611a2b43fa62773943':
  add ADT Bundle to the download page

11 years agoam fef18c61: am db3678bc: add ADT Bundle to the download page
Scott Main [Tue, 13 Nov 2012 02:06:25 +0000 (18:06 -0800)]
am fef18c61: am db3678bc: add ADT Bundle to the download page

* commit 'fef18c61f5146d1a2eb7ed1f48bf5aaa2af08923':
  add ADT Bundle to the download page

11 years agoam db3678bc: add ADT Bundle to the download page
Scott Main [Tue, 13 Nov 2012 02:05:00 +0000 (18:05 -0800)]
am db3678bc: add ADT Bundle to the download page

* commit 'db3678bcaadf74b1a940a3dafb9fda4e238250be':
  add ADT Bundle to the download page

11 years agoadd ADT Bundle to the download page
Scott Main [Tue, 23 Oct 2012 21:13:41 +0000 (14:13 -0700)]
add ADT Bundle to the download page

Change-Id: Ife533a32e29f2d5f1c58a42ad0b91c5053b44da4

11 years agoam 2e939805: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Mon, 12 Nov 2012 15:28:31 +0000 (07:28 -0800)]
am 2e939805: Reconcile with jb-mr1-release - do not merge

* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
  JOP40C
  JOP40B

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Mon, 12 Nov 2012 15:26:05 +0000 (07:26 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie852ca3761e50d4e84e554572faa3920e1880821

11 years agoJOP40C
The Android Automerger [Sat, 10 Nov 2012 06:51:38 +0000 (22:51 -0800)]
JOP40C

11 years agoJOP40B
The Android Automerger [Sat, 10 Nov 2012 00:25:54 +0000 (16:25 -0800)]
JOP40B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 10 Nov 2012 00:25:12 +0000 (16:25 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 5194366b: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 9 Nov 2012 21:09:05 +0000 (13:09 -0800)]
am 5194366b: Reconcile with jb-mr1-release - do not merge

* commit '5194366bcdb91d5908c8db50f002a891fe8b8bde':
  JOP40

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 9 Nov 2012 21:07:03 +0000 (13:07 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I482192b20bde4fcc55f9a781e37256d396c2c9fb

11 years agoJOP40
The Android Automerger [Fri, 9 Nov 2012 20:51:06 +0000 (12:51 -0800)]
JOP40

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 9 Nov 2012 20:50:33 +0000 (12:50 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 79ab2553: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 9 Nov 2012 15:22:04 +0000 (07:22 -0800)]
am 79ab2553: Reconcile with jb-mr1-release - do not merge

* commit '79ab2553a77c0f111e990e3aec342ce0cde87fc9':
  JOP39B

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 9 Nov 2012 15:19:14 +0000 (07:19 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I5d3a0c41a1626bdf59f75cd8d989d0d725fc4680

11 years agoJOP39B
The Android Automerger [Fri, 9 Nov 2012 01:53:45 +0000 (17:53 -0800)]
JOP39B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 9 Nov 2012 01:53:10 +0000 (17:53 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 17e06817: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 8 Nov 2012 22:20:58 +0000 (14:20 -0800)]
am 17e06817: Reconcile with jb-mr1-release - do not merge

* commit '17e06817a22f2a13baddec627dbf385d8799a604':
  JOP39

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 8 Nov 2012 22:18:55 +0000 (14:18 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I1ff0e098597e9de600fbec6b6661206e66a72afc

11 years agoJOP39
The Android Automerger [Thu, 8 Nov 2012 21:54:33 +0000 (13:54 -0800)]
JOP39

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 8 Nov 2012 21:53:50 +0000 (13:53 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam d84f0294: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 8 Nov 2012 16:56:04 +0000 (08:56 -0800)]
am d84f0294: Reconcile with jb-mr1-release - do not merge

* commit 'd84f02944f78595c3f72eb7e8bc422c63bd6ce89':
  JOP38C
  JOP38B

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 8 Nov 2012 16:54:06 +0000 (08:54 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I0f7fd29de4c05e6b8298814e03ea681699117fae

11 years agoJOP38C
The Android Automerger [Thu, 8 Nov 2012 02:05:21 +0000 (18:05 -0800)]
JOP38C

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 8 Nov 2012 02:04:33 +0000 (18:04 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.
Ying Wang [Thu, 8 Nov 2012 00:33:08 +0000 (16:33 -0800)]
am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.

* commit 'd0b1977f7d12736a99a99893061948c622b5d8f3':
  Collapse multiple --extra-packages into one.

11 years agoam 0138951e: Collapse multiple --extra-packages into one.
Ying Wang [Thu, 8 Nov 2012 00:30:24 +0000 (16:30 -0800)]
am 0138951e: Collapse multiple --extra-packages into one.

* commit '0138951eaffaeaf32f8376959074aabf4ecfaff1':
  Collapse multiple --extra-packages into one.

11 years agoCollapse multiple --extra-packages into one.
Ying Wang [Wed, 7 Nov 2012 22:07:34 +0000 (14:07 -0800)]
Collapse multiple --extra-packages into one.

Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2

11 years agoJOP38B
The Android Automerger [Wed, 7 Nov 2012 21:06:35 +0000 (13:06 -0800)]
JOP38B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 7 Nov 2012 21:05:41 +0000 (13:05 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam ab529f13: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 7 Nov 2012 19:37:19 +0000 (11:37 -0800)]
am ab529f13: Reconcile with jb-mr1-release - do not merge

* commit 'ab529f13368a07e619f7aa2147164eeca91144db':
  JOP38

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 7 Nov 2012 19:35:01 +0000 (11:35 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I6b6342bf7e65019d9efeb2ff138ffb728bbef063

11 years agoJOP38
The Android Automerger [Wed, 7 Nov 2012 19:18:45 +0000 (11:18 -0800)]
JOP38

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 7 Nov 2012 19:17:50 +0000 (11:17 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam b791a5fb: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 7 Nov 2012 18:22:10 +0000 (10:22 -0800)]
am b791a5fb: Reconcile with jb-mr1-release - do not merge

* commit 'b791a5fb7930e8ad8108e59fb87b6183e516a382':
  JOP37B

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 7 Nov 2012 18:19:36 +0000 (10:19 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie6ab54e92b8261bc8b2fb8819e73631237a04e84

11 years agoJOP37B
The Android Automerger [Wed, 7 Nov 2012 02:04:47 +0000 (18:04 -0800)]
JOP37B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 7 Nov 2012 02:03:47 +0000 (18:03 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 83c3110c: am 1818ea8a: Add dev settings to emulator.
Xavier Ducrohet [Wed, 7 Nov 2012 01:11:58 +0000 (17:11 -0800)]
am 83c3110c: am 1818ea8a: Add dev settings to emulator.

* commit '83c3110c401fc21f6b4a47db7e9732a7b0d00e9b':
  Add dev settings to emulator.

11 years agoam 1818ea8a: Add dev settings to emulator.
Xavier Ducrohet [Wed, 7 Nov 2012 01:09:17 +0000 (17:09 -0800)]
am 1818ea8a: Add dev settings to emulator.

* commit '1818ea8ae0f49a8c4c24413034dcd3fc34d80414':
  Add dev settings to emulator.

11 years agoAdd dev settings to emulator.
Xavier Ducrohet [Wed, 7 Nov 2012 01:03:52 +0000 (17:03 -0800)]
Add dev settings to emulator.

Change-Id: I0f92257c0a6ac92f3bce4ad004c3e2414ef0f9da

11 years agoam 34d12aaf: Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 21:29:14 +0000 (13:29 -0800)]
am 34d12aaf: Reconcile with jb-mr1-release - do not merge

* commit '34d12aaf7ab9162fe891458d45a130e93e9cbc34':
  JOP37

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 21:26:37 +0000 (13:26 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I2c8f0cf7f655c624f2c72ed967dba6b071e8fe6e

11 years agoJOP37
The Android Automerger [Tue, 6 Nov 2012 21:14:19 +0000 (13:14 -0800)]
JOP37

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 6 Nov 2012 21:13:17 +0000 (13:13 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 25e3f428: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 19:03:23 +0000 (11:03 -0800)]
am 25e3f428: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '25e3f42871569d5801082825b48c60330d9b60e0': (239 commits)
  JOP36
  JOP34
  JOP33
  JOP32C
  JOP32B
  JOP32
  JOP31
  JOP30C
  JOP30B
  JOP30
  JOP29
  JOP26B
  JOP26
  JOP24G
  JOP24F
  JOP24E
  JOP24D
  JOP24C
  JOP24B
  JVP15S
  ...

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 16:49:43 +0000 (08:49 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ie4f29093944bea7faa6eb3b3afaf098336c761ba