The Android Automerger
c147461597
"JWR31"
2013-05-01 05:56:49 -07:00
The Android Automerger
daa518d260
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-01 05:55:27 -07:00
Torne (Richard Coles)
278bbf1263
Don't concatenate the NOTICE file for a single module.
...
When the NOTICE file for a module changed, the new NOTICE was being
concatenated onto the end of the old one in non-clean builds, taking up
more and more space and presumably duplicating most of the content. Only
one set of rules for a given file can exist in make, so there cannot be
a case where more than one $(notice_file) was intentionally being
concatenated together as this would be an error.
Change-Id: I0f5fae498225eaee5cc75d854223b5ba790fcebe
2013-04-30 16:26:58 +01:00
The Android Automerger
31c46b99f5
"JWR30"
2013-04-30 05:56:46 -07:00
The Android Automerger
8c8fadcf86
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-30 05:55:53 -07:00
The Android Automerger
0e9cb06273
JWR29B
2013-04-29 16:30:24 -07:00
The Android Automerger
9491905441
"JWR29"
2013-04-29 05:57:15 -07:00
The Android Automerger
fd6a18c267
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-29 05:55:15 -07:00
The Android Automerger
f22c739dae
JWR25C
2013-04-26 13:38:10 -07:00
Jeff Brown
9d461e3080
Merge "Add v7 support libs to path map." into jb-mr2-dev
2013-04-26 18:31:05 +00:00
Ying Wang
2dc245b9cb
Clean yacc version check
...
We don't rely on host preinstalled bison/yacc now.
Change-Id: Iac0a7f1c12fe9d33baa53e48297ecb41ad89792d
2013-04-26 11:13:22 -07:00
Jeff Brown
fcf2a11387
Add v7 support libs to path map.
...
This is necessary to ensure that we correctly generate
documentation for these packages.
Bug: 8175766
Change-Id: Ia1c359c744d68f9b9423fd0e9df5516890792936
2013-04-26 00:20:17 -07:00
The Android Automerger
ab9dfeb1e4
JWR25B
2013-04-25 14:13:52 -07:00
Scott Main
9a720b759e
am 499dc52c: am 8e1d22bc: am 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
...
* commit '499dc52cb073d98d2168a75ff312db5e3cee49dd':
re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
2013-04-25 11:24:08 -07:00
Scott Main
499dc52cb0
am 8e1d22bc: am 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
...
* commit '8e1d22bc7edf9dd75e3cfbf373fc1170b809818a':
re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
2013-04-25 11:22:01 -07:00
Scott Main
8e1d22bc7e
am 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
...
* commit '55d6070ad9d9d1f0d603434d77e2c6a22b858b0d':
re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
2013-04-25 11:19:13 -07:00
Scott Main
55d6070ad9
am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
...
* commit '78568286e1818b0a49e72267d31d0283d0faad71':
re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
2013-04-25 11:17:52 -07:00
Scott Main
78568286e1
am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
...
* commit '8aa725e6947b3413a19643582f5cbe704354807a':
re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
2013-04-25 11:16:03 -07:00
Scott Main
8aa725e694
re-add styles for xml definition lists.
...
used in manifest reference pages and was lost during switch to DAC2
Change-Id: I0fcaebc37fe1665bfced4b109945c9dbf6389818
2013-04-25 11:12:51 -07:00
The Android Automerger
45e53447dd
"JWR25"
2013-04-25 05:56:35 -07:00
The Android Automerger
dec26d9664
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-25 05:55:12 -07:00
The Android Automerger
e747e529ea
JWR24B
2013-04-24 16:14:50 -07:00
The Android Automerger
d78ec2452f
"JWR24"
2013-04-24 05:56:32 -07:00
The Android Automerger
48b73af065
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-24 05:55:10 -07:00
Matthew Xie
b1f1013321
Remove DBUS from make files
...
DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904
Change-Id: I952624e61c1e570c7e8d5a23937ab93a173d135c
2013-04-23 14:01:23 -07:00
The Android Automerger
5356786217
"JWR23B"
2013-04-23 09:30:27 -07:00
The Android Automerger
fb9411bc2e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-23 09:30:09 -07:00
The Android Automerger
8292769739
"JWR23"
2013-04-23 05:56:41 -07:00
The Android Automerger
22159722bc
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-23 05:55:13 -07:00
The Android Automerger
6ef2890950
JWR22B
2013-04-22 17:00:35 -07:00
Dianne Hackborn
3bad554001
Here lies JB MR2: In with a whimper, out with a bang.
...
Change-Id: Id75e084b8447234cf5d2c26ccd0e13111dde6684
2013-04-22 13:07:44 -07:00
The Android Automerger
099c8b35dd
"JWR22"
2013-04-22 05:57:26 -07:00
The Android Automerger
d431376376
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-22 05:55:11 -07:00
Chad Jones
b6c2e6b60c
Merge commit '3359ffe4' into jb-mr2-dev
2013-04-19 20:24:07 -07:00
Robert Ly
3359ffe4dd
am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit '062dc2c6b2b8bab43241c2d4c93f0d35e9180b2e':
sac template fixes
2013-04-19 14:32:15 -07:00
Robert Ly
062dc2c6b2
am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit 'cd197b2461281ff1d123b987dbd1c2a5b5236cd2':
sac template fixes
2013-04-19 14:29:17 -07:00
Robert Ly
cd197b2461
am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit '17a52ff0682b82d99c82b5920619f6de19879a28':
sac template fixes
2013-04-19 14:25:43 -07:00
Robert Ly
17a52ff068
am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit '8b4f4f6bb3acd40e4e554ab61e3b1166686775c1':
sac template fixes
2013-04-19 14:23:40 -07:00
Robert Ly
8b4f4f6bb3
Merge "sac template fixes" into jb-mr1.1-docs
2013-04-19 21:21:47 +00:00
The Android Automerger
7d2bda02d7
JWR18C
2013-04-19 12:12:09 -07:00
The Android Automerger
e28954236a
JWR18B
2013-04-19 09:56:15 -07:00
Robert Ly
dbfc4bbc95
sac template fixes
...
Change-Id: I9e3c6b60c1fab71c53408f34d388653e85e6ba30
2013-04-18 11:35:16 -07:00
The Android Automerger
4279aa74b8
"JWR18"
2013-04-18 05:56:59 -07:00
The Android Automerger
678de99967
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-18 05:55:17 -07:00
The Android Automerger
fec4c43d3b
JWR17B
2013-04-17 15:00:34 -07:00
The Android Automerger
edc92a0977
"JWR17"
2013-04-17 05:56:52 -07:00
The Android Automerger
0155db520d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-17 05:55:11 -07:00
Ying Wang
b9267c6920
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
...
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
2013-04-16 17:36:39 -07:00
The Android Automerger
1709f39a72
JWR16B
2013-04-16 15:17:49 -07:00
Ying Wang
9592af96a7
Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
2013-04-16 15:57:48 +00:00
