Commit Graph

9306 Commits

Author SHA1 Message Date
Andrew Hsieh
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
Nick Kralevich
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
Andrew Hsieh
b7391efbf0 Merge "Add -fuse-ld=bfd to x86 target" 2012-07-25 13:40:30 -07:00
Andrew Hsieh
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
Scott Main
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
Scott Main
54d2a9b9ec add bottom-margin to div-based notes
Change-Id: I4c74ab362b00bfb68093a975171f777e3fb5eef9
2012-07-24 14:54:32 -07:00
Scott Main
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
Scott Main
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
Ying Wang
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
Ying Wang
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
Scott Main
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
Scott Main
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
Scott Main
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
The Android Open Source Project
2e5ae9873c Reconcile with jb-mr0-release jb-release
Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b
2012-07-19 08:35:48 -07:00
The Android Automerger
bdd2ce0061 JZO18 2012-07-18 21:45:08 -07:00
The Android Automerger
63b3ed66e2 merge in jb-mr0-release history after reset to jb-dev 2012-07-18 21:44:37 -07:00
Scott Main
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
Scott Main
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
Scott Main
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
Scott Main
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
Scott Main
55163c882e Doc change: add links to the More menu.
Change-Id: I77e848f86278781b0a44eb672ea711e00352fde5
2012-07-18 16:18:25 -07:00
Nick Kralevich
297d6c02bc Merge "Add property_contexts to SELINUX_DEPENDS." 2012-07-18 13:55:10 -07:00
Scott Main
e09cf92632 am 1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs
* commit '1d62fa807e1ac2c4f9ad8f31f34809ec97e975ed':
  docs: bring back min-height for nav-x for proper height of secondary tabs
2012-07-17 13:22:25 -07:00
Scott Main
1d62fa807e docs: bring back min-height for nav-x for proper height of secondary tabs
Change-Id: I865195b9fde9ec64fbe2c083c0d3617a55b54a0f
2012-07-17 13:15:12 -07:00
The Android Automerger
c14ec30c43 JZO17 2012-07-17 12:34:10 -07:00
Wink Saville
e84d651df1 am c4e790dc: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
* commit 'c4e790dc6474566799012728f9e67f5d794975b4':
  Create telephony-common and mms-common - DO NOT MERGE
2012-07-17 12:33:21 -07:00
The Android Automerger
5bcd6b4be9 merge in jb-mr0-release history after reset to jb-dev 2012-07-17 12:29:00 -07:00
The Android Automerger
516c242b31 JRO03H 2012-07-17 12:27:31 -07:00
Wink Saville
c4e790dc64 Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
  frameworks/opt/mms

telephony-common was created by moving some of
  frameworks/base/telephony
to:
  frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
2012-07-17 12:22:58 -07:00
Scott Main
b8910812fd am a214d84f: docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
* commit 'a214d84ff82bb3ae279b1f2c8ece5f65656b5e5c':
  docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
2012-07-16 18:38:14 -07:00
Scott Main
a214d84ff8 docs: upgrades to search.
Fix history navigation functionality.
Faster ajax requery while typing.
Ignore ENTER key when performing requery to avoid reload.
Improve results reveal with minimum height for proper div.

Change-Id: Ie50a6d7bdf58ad3e17dd15d30dcec973a123b7bf
2012-07-16 18:12:22 -07:00
Scott Main
8f4df715b8 am 220c3449: docs: adjust spacing for collapsible sections (release notes)
* commit '220c34492ae24f79f9b4a4fe15051360c8505807':
  docs: adjust spacing for collapsible sections (release notes)
2012-07-16 15:46:46 -07:00
Scott Main
220c34492a docs: adjust spacing for collapsible sections (release notes)
Change-Id: I68c8429e0e18bff50463b40f163df6a89ac8730a
2012-07-16 15:40:17 -07:00
The Android Automerger
eb5cbb97f7 JRO03G 2012-07-16 12:15:57 -07:00
The Android Automerger
20f8a0adac JRO03F 2012-07-13 14:19:15 -07:00
The Android Automerger
915b91599e JRO03E 2012-07-13 13:38:41 -07:00
Jean-Baptiste Queru
938cf057c5 Merge 2f16ba59
Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc
2012-07-13 12:14:04 -07:00
The Android Automerger
a882cd9b8d JRO03D 2012-07-12 17:26:25 -07:00
Justin Ho
2f16ba5997 Android 4.1.2 version bump
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
2012-07-12 16:21:00 -07:00
The Android Automerger
b71a27bae5 JZO11 2012-07-11 23:17:54 -07:00
The Android Automerger
40d7329ba6 JZO10 2012-07-11 23:16:01 -07:00
The Android Automerger
832de9cee3 merge in jb-mr0-release history after reset to jb-dev 2012-07-11 23:11:59 -07:00
Guang Zhu
96d9fa29cd resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
2012-07-11 19:36:17 -07:00
Guang Zhu
ef1335eda4 use default shell (mksh) in emulator
remove the override to use ash as shell so that mksh is the
default in 'generic' product type

Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
2012-07-11 18:35:08 -07:00
Wink Saville
c16c945497 Create telephony-common and mms-common
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
  frameworks/opt/mms

telephony-common was created by moving some of
  frameworks/base/telephony
to:
  frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
2012-07-06 18:06:36 -07:00
rpcraig
9e43f34840 Add property_contexts to SELINUX_DEPENDS.
This ensures there is a dependency between the root image
and changes to property_contexts file.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: I9bd2c3fc44015d6013e6a1f200f8abded271654f
2012-07-05 10:50:27 -04:00
The Android Open Source Project
69cfe57ae5 Reconcile with jb-release
Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da
2012-07-04 16:48:36 -07:00
The Android Automerger
39865ff7ed JRO03C 2012-07-04 13:53:25 -07:00
Scott Main
a4d57eab27 am 38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
* commit '38f19c21258592faefa652d4871d570e151a2a53':
  docs: fix search suggestions and other script bugs for offline docs
2012-07-03 14:15:43 -07:00
Scott Main
38f19c2125 Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev 2012-07-03 14:10:57 -07:00