The Android Open Source Project
d84f02944f
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I0f7fd29de4c05e6b8298814e03ea681699117fae
2012-11-08 08:54:06 -08:00
The Android Open Source Project
77d6e5f7bf
am c66e994c: am b791a5fb: Reconcile with jb-mr1-release - do not merge
...
* commit 'c66e994c3b0609eca4fa33d95cdf6fbae44ae128':
JOP37B
2012-11-08 06:26:55 -08:00
Xavier Ducrohet
ca75eaf064
am 62c12cc5: am 83c3110c: am 1818ea8a: Add dev settings to emulator.
...
* commit '62c12cc5eb331c560cef3daf8121ae938c3e4ab0':
Add dev settings to emulator.
2012-11-08 06:14:19 -08:00
The Android Open Source Project
103a052e34
am 43b91298: am 34d12aaf: Reconcile with jb-mr1-release - do not merge
...
* commit '43b912989f6cddca820e98ff29dcedf83a89ddde':
JOP37
2012-11-08 06:12:37 -08:00
Elliott Hughes
d125adca42
am ef9744f7: Merge "Remove manual WITH_JIT setting from build/."
...
* commit 'ef9744f7ee4fd2315f41c58ba48906d9d79363dd':
Remove manual WITH_JIT setting from build/.
2012-11-07 18:31:35 -08:00
Elliott Hughes
ef9744f7ee
Merge "Remove manual WITH_JIT setting from build/."
2012-11-07 18:24:43 -08:00
The Android Automerger
b8162b26e9
JOP38C
2012-11-07 18:05:21 -08:00
The Android Automerger
bba1309df0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-07 18:04:33 -08:00
Ying Wang
f99f5e89a1
am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.
...
* commit 'd0b1977f7d12736a99a99893061948c622b5d8f3':
Collapse multiple --extra-packages into one.
2012-11-07 16:33:08 -08:00
Ying Wang
d0b1977f7d
am 0138951e: Collapse multiple --extra-packages into one.
...
* commit '0138951eaffaeaf32f8376959074aabf4ecfaff1':
Collapse multiple --extra-packages into one.
2012-11-07 16:30:24 -08:00
Ying Wang
0138951eaf
Collapse multiple --extra-packages into one.
...
Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2
2012-11-07 14:07:34 -08:00
The Android Automerger
baa786da15
JOP38B
2012-11-07 13:06:35 -08:00
The Android Automerger
7c4e5df38a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-07 13:05:41 -08:00
The Android Open Source Project
151c3655cb
am ab529f13: Reconcile with jb-mr1-release - do not merge
...
* commit 'ab529f13368a07e619f7aa2147164eeca91144db':
JOP38
2012-11-07 11:37:19 -08:00
The Android Open Source Project
ab529f1336
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I6b6342bf7e65019d9efeb2ff138ffb728bbef063
2012-11-07 11:35:01 -08:00
The Android Automerger
4afe3efb73
JOP38
2012-11-07 11:18:45 -08:00
The Android Automerger
c61eca9217
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-07 11:17:50 -08:00
The Android Open Source Project
c66e994c3b
am b791a5fb: Reconcile with jb-mr1-release - do not merge
...
* commit 'b791a5fb7930e8ad8108e59fb87b6183e516a382':
JOP37B
2012-11-07 10:22:10 -08:00
The Android Open Source Project
b791a5fb79
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ie6ab54e92b8261bc8b2fb8819e73631237a04e84
2012-11-07 10:19:37 -08:00
The Android Automerger
c3102ba02e
JOP37B
2012-11-06 18:04:47 -08:00
The Android Automerger
e68753b20f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 18:03:47 -08:00
Xavier Ducrohet
62c12cc5eb
am 83c3110c: am 1818ea8a: Add dev settings to emulator.
...
* commit '83c3110c401fc21f6b4a47db7e9732a7b0d00e9b':
Add dev settings to emulator.
2012-11-06 17:11:58 -08:00
Xavier Ducrohet
83c3110c40
am 1818ea8a: Add dev settings to emulator.
...
* commit '1818ea8ae0f49a8c4c24413034dcd3fc34d80414':
Add dev settings to emulator.
2012-11-06 17:09:17 -08:00
Xavier Ducrohet
1818ea8ae0
Add dev settings to emulator.
...
Change-Id: I0f92257c0a6ac92f3bce4ad004c3e2414ef0f9da
2012-11-06 17:03:52 -08:00
Elliott Hughes
07a6db8733
Remove manual WITH_JIT setting from build/.
...
This is now done automatically by dalvik/, since
patch 272a54f8553e13b87bf819542ddc6701fc1232cc.
Change-Id: I57709538f20188417c014630442e897401d7ace0
2012-11-06 16:41:52 -08:00
The Android Open Source Project
43b912989f
am 34d12aaf: Reconcile with jb-mr1-release - do not merge
...
* commit '34d12aaf7ab9162fe891458d45a130e93e9cbc34':
JOP37
2012-11-06 13:29:14 -08:00
The Android Open Source Project
34d12aaf7a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2c8f0cf7f655c624f2c72ed967dba6b071e8fe6e
2012-11-06 13:26:37 -08:00
The Android Automerger
d67bdb4b10
JOP37
2012-11-06 13:14:19 -08:00
The Android Automerger
9e6a170b3a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 13:13:17 -08:00
The Android Open Source Project
a481e46b9a
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I2b61fb6935acf60f683171f9639c658088b259f5
2012-11-06 12:37:06 -08:00
The Android Open Source Project
4c76120bb4
am 5d0f94aa: am 25e3f428: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '5d0f94aa25d5e72fccd3b0d3ed3ecd4855b0e963':
JOP36
2012-11-06 11:06:16 -08:00
The Android Open Source Project
5d0f94aa25
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
...
2012-11-06 11:03:23 -08:00
The Android Open Source Project
25e3f42871
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: Ie4f29093944bea7faa6eb3b3afaf098336c761ba
2012-11-06 08:49:43 -08:00
The Android Automerger
ea71e3aaa3
JDP37
2012-11-06 02:51:08 -08:00
The Android Automerger
5d44c6e00a
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-06 02:13:23 -08:00
The Android Automerger
39737e6a2d
JOP36
2012-11-05 18:40:05 -08:00
The Android Automerger
bbb59782b7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-05 18:38:31 -08:00
The Android Open Source Project
ffd5c73285
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4d84725585d8d949477a1c5e398faf4828c0d3e0
2012-11-05 07:55:49 -08:00
The Android Automerger
ff344406ee
JOP34
2012-11-03 11:32:00 -07:00
The Android Automerger
38a8607dd9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-03 11:31:19 -07:00
Nick Sanders
278dbf3c6b
am 9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev
...
* commit '9af26dddb39e5d87c8a455eb462eb3039e45ad69':
Disable factory build under PDK
2012-11-02 18:48:59 -07:00
Nick Sanders
9af26dddb3
Merge "Disable factory build under PDK" into jb-mr1-aah-dev
2012-11-02 18:46:45 -07:00
The Android Automerger
fdb9350e9d
JOP33
2012-11-02 17:35:24 -07:00
The Android Automerger
9aca04c75b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-02 17:34:17 -07:00
The Android Automerger
a6d6187841
JOP32C
2012-11-02 14:46:32 -07:00
Nick Sanders
a1712eea02
Disable factory build under PDK
...
Phantasm PDK support doesn't work with the factory build.
It's not needed for eng support so we'll disable it.
Change-Id: I9b65cdbb20bbcff601600d6b0cac7cc98f6f614c
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-11-02 12:55:56 -07:00
The Android Open Source Project
3b90b0868f
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I0a15906b6b86c84c785eb57cde0b202a3b0a97cf
2012-11-02 07:27:40 -07:00
The Android Automerger
3618379ed8
JOP32B
2012-11-01 23:43:31 -07:00
The Android Automerger
3de803e46a
JOP32
2012-11-01 19:06:39 -07:00
The Android Automerger
11f0918510
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-01 19:04:59 -07:00
