The Android Automerger
1493ad7c10
JDP60
2012-11-29 07:10:53 -08:00
The Android Automerger
1c38cdc95c
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-29 07:09:13 -08:00
Robert Ly
9cdd3ca577
am b3748f31
: am 40e90998
: add google services tab
...
* commit 'b3748f317af6f19447763489800576c23a244544':
add google services tab
2012-11-28 18:18:37 -08:00
Robert Ly
b3748f317a
am 40e90998
: add google services tab
...
* commit '40e9099805da2e91ec09c3bab79a7e825fca9d91':
add google services tab
2012-11-28 18:15:48 -08:00
Robert Ly
40e9099805
add google services tab
...
Change-Id: Ia5b249b825c33334458a6762be2d62b657bc0d58
2012-11-28 17:58:58 -08:00
Jesse Hall
229b137564
Add emulator modules to PRODUCT_PACKAGES in full and sdk products
...
Bug: 7556265
Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
2012-11-28 11:27:53 -08:00
Scott Main
c86e4f3f2c
am e6f3c033
: am 36f6da28
: am 7942a936
: am d4cb7831
: add \'external-link\' class for links that go off-site
...
* commit 'e6f3c0332169a795e25f221f91db59ce87aa1f51':
add 'external-link' class for links that go off-site
2012-11-28 11:18:48 -08:00
Scott Main
e6f3c03321
am 36f6da28
: am 7942a936
: am d4cb7831
: add \'external-link\' class for links that go off-site
...
* commit '36f6da28304b06dcface33461042efbf02098af7':
add 'external-link' class for links that go off-site
2012-11-28 11:16:47 -08:00
Scott Main
36f6da2830
am 7942a936
: am d4cb7831
: add \'external-link\' class for links that go off-site
...
* commit '7942a936797e414adbe71a022a1053d8e7ac156c':
add 'external-link' class for links that go off-site
2012-11-28 11:15:20 -08:00
Scott Main
7942a93679
am d4cb7831
: add \'external-link\' class for links that go off-site
...
* commit 'd4cb783159c76d0ea9423020b3ab6ec77a21506e':
add 'external-link' class for links that go off-site
2012-11-28 11:14:20 -08:00
Scott Main
d4cb783159
add 'external-link' class for links that go off-site
...
Change-Id: I9e78cd6a7cb2ce14e5e15fe43e87b55ac456f302
2012-11-28 11:10:09 -08:00
The Android Open Source Project
caf92d0332
am d457787f
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'd457787f7af5c1971725280f50da7755c3822181':
JDP58
JDP57B
JDP57
JDP50B
JDP50
JDP47D
JDP47C
JDP47B
JDP47
2012-11-28 09:49:27 -08:00
The Android Open Source Project
d457787f7a
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I66e912b35d44f05c4fdb6686bcde4a5396aa352d
2012-11-28 09:47:11 -08:00
Robert Ly
b16c36ed81
am 44686feb
: am 1e351764
: am 50a8ce10
: am 7d131e0a
: fix build
...
* commit '44686feb7b4a7cc3245c0561f3e9b0809f233d07':
fix build
2012-11-27 18:44:11 -08:00
Scott Main
4b10b491b6
am 32bde8fd
: am 0a7c8e2b
: am 1aace7da
: am 502c939f
: docs: add support for an infinite number of nested lists in side nav
...
* commit '32bde8fd70fa23cbd9a39ef5d624ff1f1b51ac58':
docs: add support for an infinite number of nested lists in side nav
2012-11-27 18:43:34 -08:00
Ying Wang
2cfe4bc98e
am b40018cf
: am caee64a9
: am f44a518c
: am c69b7735
: Put ANDROID_BUILD_PATHS before the system default PATH
...
* commit 'b40018cf1f8e2dbb5479708af06b557730838e64':
Put ANDROID_BUILD_PATHS before the system default PATH
2012-11-27 18:43:13 -08:00
Robert Ly
44686feb7b
am 1e351764
: am 50a8ce10
: am 7d131e0a
: fix build
...
* commit '1e351764624ae82fc8cacb622808bc13a8ce03c5':
fix build
2012-11-27 17:37:05 -08:00
Robert Ly
1e35176462
am 50a8ce10
: am 7d131e0a
: fix build
...
* commit '50a8ce108bee7b530eaf25624d3f20ffbab76253':
fix build
2012-11-27 17:35:16 -08:00
Robert Ly
50a8ce108b
am 7d131e0a
: fix build
...
* commit '7d131e0ad6695d1b46ab7854277fdbbf523f3d29':
fix build
2012-11-27 17:33:27 -08:00
Keun young Park
b549949569
am 6343d2a3
: am 490d3f24
: am d4f8d5e6
: replace dummy versions with normal ones for mini
...
* commit '6343d2a35620e1a9e1c83dd284735e50cc59c8d9':
replace dummy versions with normal ones for mini
2012-11-27 17:31:26 -08:00
The Android Open Source Project
c87c8209de
am 127c69da
: (-s ours) am c361ae56
: am 257fef43
: Reconcile with jb-mr1-release - do not merge
...
* commit '127c69da094ddd8057e5a50b08e48286f06b2d3b':
bump version to 4.2.1
JOP40D
2012-11-27 17:31:24 -08:00
Robert Ly
7d131e0ad6
fix build
...
Change-Id: I3e98493aac48b0061d44351fb8c0f07a759b25c0
2012-11-27 17:27:34 -08:00
The Android Automerger
2febef697e
JDP58
2012-11-27 15:35:46 -08:00
The Android Automerger
7c761e2a14
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-27 15:34:09 -08:00
Scott Main
32bde8fd70
am 0a7c8e2b
: am 1aace7da
: am 502c939f
: docs: add support for an infinite number of nested lists in side nav
...
* commit '0a7c8e2be18dc4ee4b2093538793948601e40b0a':
docs: add support for an infinite number of nested lists in side nav
2012-11-27 15:12:00 -08:00
Scott Main
0a7c8e2be1
am 1aace7da
: am 502c939f
: docs: add support for an infinite number of nested lists in side nav
...
* commit '1aace7da06b4f9d4c5024a18accf99b2e4be0fb3':
docs: add support for an infinite number of nested lists in side nav
2012-11-27 15:10:17 -08:00
Scott Main
1aace7da06
am 502c939f
: docs: add support for an infinite number of nested lists in side nav
...
* commit '502c939f6d0818d985a45ca54e35c0a3efa1470b':
docs: add support for an infinite number of nested lists in side nav
2012-11-27 15:09:17 -08:00
Scott Main
502c939f6d
docs: add support for an infinite number of nested lists in side nav
...
Change-Id: I9e0fa672e20067f3e09f56560e7d11847d0b9388
2012-11-27 15:00:40 -08:00
Ying Wang
b40018cf1f
am caee64a9
: am f44a518c
: am c69b7735
: Put ANDROID_BUILD_PATHS before the system default PATH
...
* commit 'caee64a98ac6f7f88888e2105ca07da17bb6311b':
Put ANDROID_BUILD_PATHS before the system default PATH
2012-11-27 14:21:06 -08:00
Ying Wang
caee64a98a
am f44a518c
: am c69b7735
: Put ANDROID_BUILD_PATHS before the system default PATH
...
* commit 'f44a518c104b706c752b671b0308716c7cca73d5':
Put ANDROID_BUILD_PATHS before the system default PATH
2012-11-27 14:18:53 -08:00
Ying Wang
f44a518c10
am c69b7735
: Put ANDROID_BUILD_PATHS before the system default PATH
...
* commit 'c69b773506ecf2316059a9fe947bbeb524a402b3':
Put ANDROID_BUILD_PATHS before the system default PATH
2012-11-27 14:17:27 -08:00
Ying Wang
c69b773506
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
2012-11-27 14:14:42 -08:00
Keun young Park
6343d2a356
am 490d3f24
: am d4f8d5e6
: replace dummy versions with normal ones for mini
...
* commit '490d3f24fce962c4cb98b1517f0ef1056906d587':
replace dummy versions with normal ones for mini
2012-11-27 11:35:54 -08:00
The Android Open Source Project
127c69da09
am c361ae56
: am 257fef43
: Reconcile with jb-mr1-release - do not merge
...
* commit 'c361ae56dc7f3909cb9c1adb2af2602bd0428c7b':
bump version to 4.2.1
JOP40D
2012-11-27 11:35:53 -08:00
Keun young Park
490d3f24fc
am d4f8d5e6
: replace dummy versions with normal ones for mini
...
* commit 'd4f8d5e64950eb114993a9de975e1519e3509d43':
replace dummy versions with normal ones for mini
2012-11-27 11:31:50 -08:00
The Android Open Source Project
c361ae56dc
am 257fef43
: Reconcile with jb-mr1-release - do not merge
...
* commit '257fef430806408dbaca2708018b144d430fbdef':
bump version to 4.2.1
JOP40D
2012-11-27 11:31:33 -08:00
Ying Wang
a7c8f72b40
Use the correct size key
...
At this point, userdata_size has been converted to partition_size in
build_image.ImagePropFromGlobalDict().
Change-Id: Ida6be1905ca3109c2660274a16359a9f3fbcd94d
2012-11-27 11:29:11 -08:00
Keun young Park
d4f8d5e649
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
2012-11-27 10:54:17 -08:00
Ying Wang
3767d7ade8
Merge "Run e2fsck on built sparse images."
2012-11-27 10:07:37 -08:00
Ying Wang
78aba0adbf
Merge "Put ANDROID_BUILD_PATHS before the system default PATH"
2012-11-27 09:57:55 -08:00
Ying Wang
69e9b4d6d1
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-11-27 09:57:17 -08:00
The Android Open Source Project
0598c4b30f
am 76828ed6
: (-s ours) am a2314e43
: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
...
* commit '76828ed64585c20023dd998eb53ec083d5996713':
2012-11-27 08:11:35 -08:00
The Android Open Source Project
76828ed645
am a2314e43
: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
...
* commit 'a2314e433e3383b6fdaff6dedac1b314c494cd09':
2012-11-27 08:09:14 -08:00
The Android Open Source Project
a2314e433e
Merge jb-mr1-dev into aosp/master - do not merge
...
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
2012-11-27 08:06:10 -08:00
The Android Open Source Project
257fef4308
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911
2012-11-27 07:33:15 -08:00
Ying Wang
aa1c9b5837
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
2012-11-26 20:52:31 -08:00
The Android Automerger
cc862f246e
JDP57B
2012-11-26 12:23:23 -08:00
The Android Automerger
c87917eb8d
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-26 12:22:55 -08:00
The Android Automerger
14eee53ca4
JDP57
2012-11-26 11:29:42 -08:00
The Android Automerger
92ad3fdc4f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-26 11:28:48 -08:00