The Android Automerger
09446191ed
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-19 16:12:53 -08:00
Ed Heyl
d4382dd07e
bump version to 4.2.1
...
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 16:04:18 -08:00
The Android Automerger
476750c763
JOP40D
2012-11-19 16:03:54 -08:00
The Android Automerger
5a149026e6
JDP47D
2012-11-19 15:44:50 -08:00
Jean-Baptiste Queru
136383549f
Merge f7306051c1
...
Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
2012-11-19 15:08:59 -08:00
Ed Heyl
f7306051c1
am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1
...
* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
bump version to 4.2.1
2012-11-19 14:29:37 -08:00
Ed Heyl
0ddeb0ccc1
am efcc8b1c: bump version to 4.2.1
...
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
bump version to 4.2.1
2012-11-19 14:26:49 -08:00
Ed Heyl
efcc8b1c79
bump version to 4.2.1
...
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 14:20:48 -08:00
Jean-Baptiste Queru
9d9def1b18
resolved conflicts for merge of 4749c6e3 to jb-mr1-dev-plus-aosp - do not merge
...
Change-Id: I51fcb88d6b9f188a9c596031a2506eedc7150173
2012-11-19 10:57:48 -08:00
Jean-Baptiste Queru
4749c6e3e2
Merge "build_id: change to OPENMASTER"
2012-11-19 09:23:42 -08:00
Chirayu Desai
6d492971dd
build_id: change to OPENMASTER
...
Change-Id: I87863d8064515a0fabadacf4ca692c775fc4aae0
2012-11-18 14:09:34 +05:30
The Android Automerger
cd540e9a59
JDP47C
2012-11-16 17:23:04 -08:00
The Android Automerger
9f8ccf3e95
JDP47B
2012-11-16 17:01:05 -08:00
Ben Cheng
bf031a2586
am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*."
...
* commit '17c679d07380b0a4045045fd5d8e56111edf3fbd':
[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
2012-11-16 16:23:02 -08:00
Ben Cheng
17c679d073
Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*."
2012-11-16 15:48:44 -08:00
Ben Cheng
8bc4c438bd
[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
...
In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.
Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe
2012-11-16 13:29:13 -08:00
The Android Automerger
30c4cabb3a
JDP47
2012-11-16 11:32:14 -08:00
Scott Main
691369bd6e
am 287d1e42: 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 '287d1e42b48d74d3cba1d362d6379cd5ddcd0de4':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 10:52:05 -08:00
Scott Main
287d1e42b4
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
2012-11-16 10:48:50 -08:00
Scott Main
6a0402701e
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
2012-11-16 10:45:44 -08:00
Scott Main
34a4b8239e
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
2012-11-16 10:43:23 -08:00
Scott Main
8f24ca8e3b
docs: revise message when api level for docs is too low;
...
make the message appear on package pages as well
Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
2012-11-16 10:34:22 -08:00
Guang Zhu
fdf573e4e0
am 06b57cef: am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1
...
* commit '06b57cefeaadd0e2f02a5c8a8679884366f4345e':
DO NOT MERGE: change build id to JB MR1.1
2012-11-15 18:00:23 -08:00
Guang Zhu
06b57cefea
am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1
...
* commit 'f0d4d8f32934df6dc859e2b668d436d67b388cd2':
DO NOT MERGE: change build id to JB MR1.1
2012-11-15 17:57:58 -08:00
Guang Zhu
f0d4d8f329
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
2012-11-15 17:47:53 -08:00
Scott Main
932682e619
am 9ade5e79: am 1f0850ee: am 11ac05bb: docs: add script for 32/64-bit bundle downloads
...
* commit '9ade5e79870f077d1b99a03cddde1adecfa3236c':
docs: add script for 32/64-bit bundle downloads
2012-11-15 15:26:16 -08:00
Ying Wang
ae56a570cb
am e1f94189: am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
...
* commit 'e1f94189d95084a72d206d89ecb9d38de0512fc6':
Move check-api to definition.mk
2012-11-15 15:23:44 -08:00
Scott Main
9ade5e7987
am 1f0850ee: am 11ac05bb: docs: add script for 32/64-bit bundle downloads
...
* commit '1f0850ee04dcb54e0969f40f692ae00f1da5843b':
docs: add script for 32/64-bit bundle downloads
2012-11-15 15:23:43 -08:00
Scott Main
1f0850ee04
am 11ac05bb: docs: add script for 32/64-bit bundle downloads
...
* commit '11ac05bb015c4097f828b0907a0835f7d546738c':
docs: add script for 32/64-bit bundle downloads
2012-11-15 15:21:00 -08:00
Ying Wang
e1f94189d9
am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
...
* commit 'ce811261bc8d56d43e59b1f9fb96ae53192de126':
Move check-api to definition.mk
2012-11-15 15:20:58 -08:00
Scott Main
11ac05bb01
docs: add script for 32/64-bit bundle downloads
...
Change-Id: I502e4ced8ac30cc19bf321e7a586f28244bf1294
2012-11-15 15:18:05 -08:00
Ying Wang
ce811261bc
Merge "Move check-api to definition.mk" into jb-mr1.1-dev
2012-11-15 15:17:43 -08:00
Scott Main
234fa6175c
am aa09fda2: am 2dc85a0f: am 83cd28b3: am 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page
...
* commit 'aa09fda25ee5b349e55ff502536a38f2f44b28b3':
add script to generate list of classes for each training course landing page
2012-11-14 17:46:08 -08:00
Scott Main
aa09fda25e
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
2012-11-14 17:44:57 -08:00
Scott Main
2dc85a0fe0
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
2012-11-14 17:42:20 -08:00
Scott Main
83cd28b354
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
2012-11-14 17:40:58 -08:00
Scott Main
9efb6b09c4
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
2012-11-14 17:39:42 -08:00
Scott Main
be264b6da6
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
2012-11-14 17:38:11 -08:00
Scott Main
5a1123ef7a
add script to generate list of classes for each training course landing page
...
Change-Id: Ieac8a97a8d6fda41a3682241901150cfe16afc4d
2012-11-14 17:31:07 -08:00
Ying Wang
c065da2307
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
2012-11-14 16:00:45 -08:00
Scott Main
1e94081f55
am c264f9eb: am 912ed02b: am 7c05b69c: docs: add warning message for adt when on 32-bit os
...
* commit 'c264f9eb78e2253e91cc0dca11cdf354d341df96':
docs: add warning message for adt when on 32-bit os
2012-11-14 15:17:57 -08:00
Scott Main
c264f9eb78
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
2012-11-14 15:15:25 -08:00
Scott Main
912ed02b53
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
2012-11-14 15:13:25 -08:00
Scott Main
7c05b69c0c
docs: add warning message for adt when on 32-bit os
...
Change-Id: I457a219bb1f9e07d6b94084c69c56309568a4881
2012-11-14 14:12:29 -08:00
The Android Open Source Project
605d6acbd8
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I01253a246391b976768fa35cecaba09f15e2bcd5
2012-11-14 12:40:44 -08:00
The Android Automerger
fed8cf4487
JDP45
2012-11-14 11:30:08 -08:00
The Android Automerger
fdeeaee457
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-14 11:27:43 -08:00
Scott Main
eeb8d64ad1
am ee217260: am 4e9b723f: am 098d8dea: docs: add support for ndk tos wall
...
* commit 'ee2172600b52d73944696e414a0c40e812d4f5d5':
docs: add support for ndk tos wall
2012-11-13 11:46:12 -08:00
Scott Main
ee2172600b
am 4e9b723f: am 098d8dea: docs: add support for ndk tos wall
...
* commit '4e9b723f694b4713bdc30e8019b82b43b1217bae':
docs: add support for ndk tos wall
2012-11-13 11:44:46 -08:00
Scott Main
4e9b723f69
am 098d8dea: docs: add support for ndk tos wall
...
* commit '098d8deaefaf6f834db86c15999d2aedd038d272':
docs: add support for ndk tos wall
2012-11-13 11:42:50 -08:00
