c11b5efa3a
Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"
2012-07-25 17:56:24 -07:00
e35a445f2f
Should have been included in 74e883d141
...
Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
2012-07-25 17:55:03 -07:00
c22da7d7e2
Merge "Don't try to build the emulator on Mac OS if the right tools aren't installed."
2012-07-25 17:41:50 -07:00
4b0c5ee8e0
am c759e468: am b7391efb: Merge "Add -fuse-ld=bfd to x86 target"
...
* commit 'c759e468995417a0c8c0ca7ca38e4c937a176ab8':
Add -fuse-ld=bfd to x86 target
2012-07-25 15:06:00 -07:00
07a06f6e44
am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."
...
* commit 'f0daadf6988c823355e9b59996e3dc798b7b7619':
Add property_contexts to SELINUX_DEPENDS.
2012-07-25 15:05:58 -07:00
74e883d141
Don't try to build the emulator on Mac OS if the right tools aren't installed.
...
Change-Id: I3cd2f82f9ee64174bddbb12a18ca8fcf23bdcebd
2012-07-25 15:01:22 -07:00
c759e46899
am b7391efb: Merge "Add -fuse-ld=bfd to x86 target"
...
* commit 'b7391efbf03d47876fd0747a5cf2199f6b4a503a':
Add -fuse-ld=bfd to x86 target
2012-07-25 14:25:30 -07:00
f0daadf698
am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."
...
* commit '297d6c02bc1e1c63404d8d81df28f3f13046fe85':
Add property_contexts to SELINUX_DEPENDS.
2012-07-25 14:25:28 -07:00
da6f6708a3
JRO03K
2012-07-25 13:54:38 -07:00
b7391efbf0
Merge "Add -fuse-ld=bfd to x86 target"
2012-07-25 13:40:30 -07:00
f116e9bc84
Add -fuse-ld=bfd to x86 target
...
Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
Change-Id: I4e78967a076b3d093dd55366f7a54f0c9f9a45d1
2012-07-25 11:06:28 -07:00
bae121afcd
Add -fuse-ld=bfd to x86 target
...
Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
Change-Id: Ie6fa0a2ddfc57b650552c8cf0891f738a5be0dda
2012-07-25 11:02:52 -07:00
7474226657
JOO25
2012-07-25 07:12:17 -07:00
345c76c79a
merge in jb-mr1-release history after reset to master
2012-07-25 07:10:09 -07:00
5096823405
am 42950013: am 54d2a9b9: add bottom-margin to div-based notes
...
* commit '42950013b7b80a085443d99c1676912f1398b752':
add bottom-margin to div-based notes
2012-07-24 22:05:48 -07:00
42950013b7
am 54d2a9b9: add bottom-margin to div-based notes
...
* commit '54d2a9b9ec90d3e4697f7915a183d8cfcc7e20b0':
add bottom-margin to div-based notes
2012-07-24 22:01:18 -07:00
5b014ccfbc
JRO03J
2012-07-24 20:31:56 -07:00
8e8ff1db37
JRO24
2012-07-24 20:23:28 -07:00
33762a7384
merge in jb-release history after reset to jb-dev
2012-07-24 20:23:07 -07:00
d43d6f71e8
JRO03I
2012-07-24 18:36:24 -07:00
54d2a9b9ec
add bottom-margin to div-based notes
...
Change-Id: I4c74ab362b00bfb68093a975171f777e3fb5eef9
2012-07-24 14:54:32 -07:00
87af4ec5de
JOO24B
2012-07-24 14:17:39 -07:00
91f6799f06
JZO24
2012-07-24 12:39:49 -07:00
c199d3031d
merge in jb-mr0-release history after reset to jb-dev
2012-07-24 12:39:22 -07:00
de3edb7f8b
JOO24
2012-07-24 08:54:43 -07:00
375b606314
am 905a015c: am 06cb5c73: Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
...
* commit '905a015c99816122e92d5e59f02efab8e2194958':
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
2012-07-23 19:52:35 -07:00
9f42af5bbc
resolved conflicts for merge of a8df6091 to master
...
Change-Id: I2d088c09738b34f72c2efa030304fca28ad0e791
2012-07-23 19:49:48 -07:00
905a015c99
am 06cb5c73: Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
...
* commit '06cb5c73f3f62a2da0138d3f55e19c47a2632182':
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
2012-07-23 14:38:57 -07:00
06cb5c73f3
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
...
Change-Id: I0283e2634713d3fb6c99b465687c605e32a776f3
2012-07-23 14:34:34 -07:00
a8df6091fe
am 28437aac: Add LOCAL_SOURCE_FILES_ALL_GENERATED support
...
* commit '28437aac999eb04d1698d9a6de87a25b5b772da6':
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
2012-07-23 10:32:54 -07:00
28437aac99
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
...
Set "LOCAL_SOURCE_FILES_ALL_GENERATED := true" if you want to build a
Java library from only generated source files, without any static
source files. Previously this is not allowed.
This is needed by building api stub libraries, which have only source
files of generated stub files.
Bug: 6814443
Change-Id: Idb2ae9c71a473b796154a03ef07a3403461c4f3c
2012-07-19 14:38:43 -07:00
74aa3e49c4
am a24cd5eb: am b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev
...
* commit 'a24cd5ebf0476c003fa97acb8eedbc9939166bca':
docs: further specify design docs' list styles to fix uls appearing like ols
2012-07-19 11:14:58 -07:00
a24cd5ebf0
am b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev
...
* commit 'b72b7b84b6c0c3a59da6f34531b362782090cabf':
docs: further specify design docs' list styles to fix uls appearing like ols
2012-07-19 11:13:41 -07:00
b72b7b84b6
Merge "docs: further specify design docs' list styles to fix uls appearing like ols" into jb-dev
2012-07-19 11:03:42 -07:00
b9ae92b401
docs: further specify design docs' list styles to fix uls appearing like ols
...
Change-Id: I203daeafb390532e34687338d5c3d4a307ba680f
2012-07-19 11:01:27 -07:00
39a7a7d9a8
am 2e5ae987: Reconcile with jb-mr0-release jb-release
...
* commit '2e5ae9873c4f62f90342cd042eff457c7e1103f0':
JZO18
JZO17
JRO03H
JRO03G
JRO03F
JRO03E
JRO03D
JZO11
JZO10
2012-07-19 08:52:00 -07:00
2e5ae9873c
Reconcile with jb-mr0-release jb-release
...
Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b
2012-07-19 08:35:48 -07:00
bdd2ce0061
JZO18
2012-07-18 21:45:08 -07:00
63b3ed66e2
merge in jb-mr0-release history after reset to jb-dev
2012-07-18 21:44:37 -07:00
1a69876fb3
am 3fae8d4e: am 71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev
...
* commit '3fae8d4e5685e604cc1dcc3c72745d6b521cfdc1':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654
2012-07-18 20:17:48 -07:00
0a798c2097
am 57267e56: am 55163c88: Doc change: add links to the More menu.
...
* commit '57267e567f011d9db838b1a46be1290e563d6f77':
Doc change: add links to the More menu.
2012-07-18 20:17:47 -07:00
3fae8d4e56
am 71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev
...
* commit '71b28a600e52922a7a18b990f256b2fa104d32e8':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654
2012-07-18 20:14:58 -07:00
57267e567f
am 55163c88: Doc change: add links to the More menu.
...
* commit '55163c882e8d97d48f58f8ac86c394ce07548d8c':
Doc change: add links to the More menu.
2012-07-18 20:14:03 -07:00
71b28a600e
Merge "docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev
2012-07-18 16:59:41 -07:00
7f527b3f44
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries.
...
bug: 6843654
Change-Id: I5fee7426d8ad404a5f03f37297fe72009df30de7
2012-07-18 16:58:29 -07:00
55163c882e
Doc change: add links to the More menu.
...
Change-Id: I77e848f86278781b0a44eb672ea711e00352fde5
2012-07-18 16:18:25 -07:00
6fe6c3c22e
pdk: add telephony-common and mms-common
...
Factory test apps may need to compile against telephony-common and
mms-common, include the jars in the pdk platform.zip.
Change-Id: Ic3533ec42115150b94298f15acd877ef61c6660c
2012-07-18 16:06:19 -07:00
297d6c02bc
Merge "Add property_contexts to SELINUX_DEPENDS."
2012-07-18 13:55:10 -07:00
42ced6d5e2
x86: cleanups for toolchain
...
The 4.4.3 TC was still being specified in one spot.
Also, no need to cross-set x86/ARM variables when buliding
for ARM/x86.
Change-Id: Icbb0f772a983a24dc10ccab0800d4b7bbd60a099
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-07-17 21:40:12 -07:00
67f570576d
am e09cf926: am 1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs
...
* commit 'e09cf926325c78b4c2885df83003d1e1c812f94c':
docs: bring back min-height for nav-x for proper height of secondary tabs
2012-07-17 14:11:53 -07:00
Joe Onorato