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
Robert Ly
16204b6af7
am 78377bcd: am 5a6e2407: am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '78377bcd1a08d99e446dc7f1e1b886c624dd3148':
add css animation videos
2012-11-01 17:39:11 -07:00
Robert Ly
78377bcd1a
am 5a6e2407: am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '5a6e24074851fba5fb40b4f453d1a18852053ffa':
add css animation videos
2012-11-01 17:36:06 -07:00
Robert Ly
5a6e240748
am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '0900e42e488eec40dd40c6e82a9823ca338b11b5':
add css animation videos
2012-11-01 17:33:03 -07:00
Robert Ly
0900e42e48
am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '12e6b988cbe32fda61957ed87bfb30337c2b8f9d':
add css animation videos
2012-11-01 17:31:20 -07:00
Robert Ly
12e6b988cb
am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit 'e896e3447145859371d2b7172122faabe44d10e2':
add css animation videos
2012-11-01 17:28:28 -07:00
Robert Ly
e896e34471
Merge "add css animation videos" into jb-dev-docs
2012-11-01 17:26:34 -07:00
Robert Ly
d78354d35b
add css animation videos
...
Change-Id: I2e51cfce1af378e03a9ac40be76ab55e61d19f24
2012-11-01 17:13:44 -07:00
The Android Open Source Project
9f1ba7e687
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Idf71be6e72f974579d6b5fe382f7fe4afd56c7cc
2012-11-01 07:51:40 -07:00
The Android Automerger
2d0ea5bee3
JOP31
2012-10-31 18:35:54 -07:00
The Android Automerger
6a9426cb14
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-31 18:33:46 -07:00
The Android Open Source Project
0c958246b0
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I588ae4c43c605d0a5d9b6a61e90f868b2fd41ea7
2012-10-31 09:15:24 -07:00
The Android Automerger
b3a7adffba
JOP30C
2012-10-30 21:53:41 -07:00
The Android Automerger
773c4ad252
JOP30B
2012-10-30 20:13:08 -07:00
The Android Automerger
0bd5295f0f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 20:11:57 -07:00
The Android Automerger
24ffc43235
JOP30
2012-10-30 08:53:55 -07:00
The Android Automerger
d11e0ff637
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 08:52:22 -07:00
Ying Wang
5dc158b363
am a281e6a9: Merge "Filter out the overridden packages before doing required module expansion."
...
* commit 'a281e6a9c3e9ee2b38e38014324bf58ae1dff9a2':
Filter out the overridden packages before doing required module expansion.
2012-10-29 17:14:55 -07:00
The Android Automerger
e5eabd42de
JOP29
2012-10-29 11:21:19 -07:00
The Android Automerger
a69ca86e99
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-29 11:19:42 -07:00
The Android Automerger
72ec23af4a
JOP26B
2012-10-26 18:18:17 -07:00
The Android Automerger
46869982c5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-26 18:17:25 -07:00
Joe Onorato
c9b12129b4
am 9a6a326c: Fix broken dependencies with the layers.txt files.
...
* commit '9a6a326ccd975af6aa27f5d4043dfd04d85f9c16':
Fix broken dependencies with the layers.txt files.
2012-10-26 18:16:39 -07:00
Joe Onorato
9a6a326ccd
Fix broken dependencies with the layers.txt files.
...
When a device java module was using the layers.txt files, and that device java module depenended on
a host java module, when building the host java module, the layer checker tried to run and would
fail, complaining about the host module.
The problem was that since the value wasn't set for the host module, it would be inherited from its
dependent module (a make "feature") and would cause the layer checker to run. So this change makes
it explicitly set PRIVATE_JAVA_LAYERS_FILE for host java modules too.
Change-Id: Ifbc085295d0995a2da5d6d63d8cb379ef2631cc4
2012-10-26 16:38:14 -07:00
The Android Automerger
5e6de3201e
JOP26
2012-10-26 16:24:09 -07:00
The Android Automerger
c1f2f71fef
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-26 16:22:28 -07:00
Ying Wang
a281e6a9c3
Merge "Filter out the overridden packages before doing required module expansion."
2012-10-26 14:17:41 -07:00
Ying Wang
84da5c55dd
Filter out the overridden packages before doing required module expansion.
...
Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
2012-10-26 14:17:06 -07:00
The Android Automerger
eda9d28e79
JOP24G
2012-10-26 13:53:07 -07:00
Ying Wang
4182482522
am 0d211eb9: Merge "Split to multiple bash commands."
...
* commit '0d211eb9f4a2bb508f7c0cc649faf99b4815bfc7':
Split to multiple bash commands.
2012-10-26 10:54:52 -07:00
Ying Wang
0d211eb9f4
Merge "Split to multiple bash commands."
2012-10-26 10:14:42 -07:00
Ying Wang
d9a88d585f
Split to multiple bash commands.
...
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Bug tracker Link: http://code.google.com/p/android/issues/detail?id=38937
Change-Id: I72258125c4297dfd9f8f502a96dbfa5a08f3cc50
2012-10-26 09:40:07 -07:00
Mike Lockwood
86e2fd9215
am daf5e22d: Add new embedded target for a super minimal android build
...
* commit 'daf5e22dbac03e174e22c8209ed97c44c3a2a2c9':
Add new embedded target for a super minimal android build
2012-10-26 08:45:36 -07:00
The Android Automerger
d8e254518b
JOP24F
2012-10-25 23:50:30 -07:00
The Android Automerger
c5c150bc91
JOP24E
2012-10-25 21:42:22 -07:00
Mike Lockwood
daf5e22dba
Add new embedded target for a super minimal android build
...
Remove obsolete BUILD_TINY_ANDROID
Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
2012-10-25 15:28:37 -07:00
The Android Automerger
9e85098d87
JOP24D
2012-10-25 14:54:17 -07:00
The Android Automerger
f4f46dcc0d
JOP24C
2012-10-25 13:43:53 -07:00
The Android Automerger
444d58845c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-25 13:42:03 -07:00
Scott Main
7a28737222
am cee5107c: am 4e51d8e6: am 4810a244: am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit 'cee5107cf6a2ba53a729e7eedc7c9c91bd27aa1b':
update class header for deprecated info
2012-10-24 19:43:00 -07:00
Scott Main
cee5107cf6
am 4e51d8e6: am 4810a244: am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit '4e51d8e6d5084a1c9133137e65a36d8e9e0c8cc1':
update class header for deprecated info
2012-10-24 19:40:45 -07:00
Scott Main
4e51d8e6d5
am 4810a244: am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit '4810a2440c5b9a890f653602164c72c8d0e86750':
update class header for deprecated info
2012-10-24 19:38:51 -07:00
Scott Main
4810a2440c
am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit '71e20e2e562957681fdd3965dfc308edcbafa31f':
update class header for deprecated info
2012-10-24 19:35:37 -07:00
Scott Main
71e20e2e56
am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit 'ef4d10811ae7949357cffcd9aa1dda93c2a582ca':
update class header for deprecated info
2012-10-24 19:33:16 -07:00
Scott Main
ef4d10811a
Merge "update class header for deprecated info" into jb-dev-docs
2012-10-24 19:31:25 -07:00
Scott Main
27ac66542a
update class header for deprecated info
...
Change-Id: I4c41f0bdbac43dc49c99af7bcb5521f7e3278304
2012-10-24 18:50:46 -07:00
The Android Automerger
d125b703ec
JOP24B
2012-10-24 16:58:29 -07:00
