OSDN Git Service
The Android Open Source Project [Tue, 7 Aug 2012 21:58:18 +0000 (14:58 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I23b8891143173a18d563ffaf2ba6aabcc30745ce
The Android Automerger [Tue, 7 Aug 2012 20:02:14 +0000 (13:02 -0700)]
JZO38
The Android Automerger [Tue, 7 Aug 2012 20:00:36 +0000 (13:00 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Scott Main [Tue, 7 Aug 2012 01:56:45 +0000 (18:56 -0700)]
am
9332a459: docs: comment-out unused style (the png currently does not resolve)
* commit '
9332a459186e467aba6b3b9b8c16e0fd3dc84860':
docs: comment-out unused style (the png currently does not resolve)
Scott Main [Tue, 7 Aug 2012 01:54:18 +0000 (18:54 -0700)]
docs: comment-out unused style (the png currently does not resolve)
Change-Id: I665068f0808a81c98cbd0685f68ed7f4df4cf0e0
The Android Open Source Project [Mon, 6 Aug 2012 20:49:54 +0000 (13:49 -0700)]
Reconcile with jb-release - do not merge
Change-Id: Ie539da33a9901ca28759cf85c566bdf201191319
The Android Automerger [Mon, 6 Aug 2012 19:32:03 +0000 (12:32 -0700)]
JRO03O
The Android Open Source Project [Fri, 3 Aug 2012 20:23:06 +0000 (13:23 -0700)]
Reconcile with jb-release - do not merge
Change-Id: Ica5beb67763852c66e2b777e6acb2216bcc1a32a
The Android Open Source Project [Fri, 3 Aug 2012 19:11:39 +0000 (12:11 -0700)]
Reconcile AOSP and GOOG jb-release
Change-Id: Ia2b3ff4617a72ba3771fc2ed829e2d7c7c83e611
The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]
JRO03L
The Android Automerger [Wed, 25 Jul 2012 20:54:38 +0000 (13:54 -0700)]
JRO03K
The Android Automerger [Wed, 25 Jul 2012 03:31:56 +0000 (20:31 -0700)]
JRO03J
Change-Id: Ie86b38cf882d6acf5f3569f3286c9a9913918d43
The Android Automerger [Wed, 25 Jul 2012 01:36:24 +0000 (18:36 -0700)]
JRO03I
Roman Nurik [Wed, 1 Aug 2012 19:41:10 +0000 (12:41 -0700)]
am
c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit '
c9e30dce7c7709a1d8b54bd9f2037e5fc8ff992f':
Improve print stylesheet for d.a.c.
Roman Nurik [Wed, 1 Aug 2012 19:39:18 +0000 (12:39 -0700)]
Merge "Improve print stylesheet for d.a.c." into jb-dev
Roman Nurik [Wed, 1 Aug 2012 17:37:40 +0000 (10:37 -0700)]
Improve print stylesheet for d.a.c.
- Improve printed page margins
- Hide navigational elements
- Print link URLs
- Improve spacing on key elements
Change-Id: Ic487e00636b1d06f15d7a29b4162c9e31f5569b1
Scott Main [Wed, 1 Aug 2012 19:12:51 +0000 (12:12 -0700)]
am
2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.
* commit '
2ccbd3f8d44bbc9b7a542144751767fe093083e7':
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Scott Main [Wed, 1 Aug 2012 19:05:12 +0000 (12:05 -0700)]
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Change-Id: Iccde983bf31338752f83ac72c0cdc543b4faf12a
The Android Open Source Project [Tue, 31 Jul 2012 21:47:40 +0000 (14:47 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I62fe0d8e8c927ef31e1d3cd44775a7018828af95
The Android Automerger [Tue, 31 Jul 2012 21:08:19 +0000 (14:08 -0700)]
JZO31
The Android Automerger [Tue, 31 Jul 2012 21:07:00 +0000 (14:07 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Scott Main [Tue, 31 Jul 2012 19:45:28 +0000 (12:45 -0700)]
am
a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev
* commit '
a8d7485de2d43e2c9c77ed62638174742bc66d1f':
add script to create links on topic landing page for first doc that use the doc's title
Scott Main [Tue, 31 Jul 2012 19:43:28 +0000 (12:43 -0700)]
Merge "add script to create links on topic landing page for first doc that use the doc's title" into jb-dev
The Android Automerger [Tue, 31 Jul 2012 15:18:14 +0000 (08:18 -0700)]
JRO03N
Scott Main [Fri, 27 Jul 2012 01:00:14 +0000 (18:00 -0700)]
add script to create links on topic landing page for first doc that use the doc's title
Change-Id: Iec86a5b9fa7dcd9246d6e8958f17e0022e0963a8
The Android Automerger [Mon, 30 Jul 2012 22:51:31 +0000 (15:51 -0700)]
JRO03M
Elliott Hughes [Fri, 27 Jul 2012 22:47:34 +0000 (15:47 -0700)]
am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
b9c2a66a4897b9be02d53f36bf9d212141c2dfb0':
Now zoneinfo prebuilts are Android modules.
The Android Open Source Project [Fri, 27 Jul 2012 21:49:57 +0000 (14:49 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: I8b44c9fafc5d0a2c0d6ad959c5e2ed0ae02b3f54
Elliott Hughes [Fri, 27 Jul 2012 21:14:57 +0000 (14:14 -0700)]
Merge "Now zoneinfo prebuilts are Android modules."
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.
(cherry-picked from
101d32ebb80f5f015781b98cb53739e8ad933cb4.)
Bug:
6857263
Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:14:48 +0000 (10:14 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:05:22 +0000 (10:05 -0700)]
Merge "Fix build."
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
The Android Automerger [Fri, 27 Jul 2012 00:50:34 +0000 (17:50 -0700)]
JZO26
The Android Automerger [Fri, 27 Jul 2012 00:49:20 +0000 (17:49 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]
JRO03L
Joe Onorato [Thu, 26 Jul 2012 05:22:15 +0000 (22:22 -0700)]
Joe Onorato [Thu, 26 Jul 2012 05:22:14 +0000 (22:22 -0700)]
am
c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."
* commit '
c22da7d7e2de0b4cbeefb533990d81581d19432a':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
Joe Onorato [Thu, 26 Jul 2012 00:56:24 +0000 (17:56 -0700)]
Joe Onorato [Thu, 26 Jul 2012 00:55:03 +0000 (17:55 -0700)]
Should have been included in
74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
Joe Onorato [Thu, 26 Jul 2012 00:41:49 +0000 (17:41 -0700)]
Merge "Don't try to build the emulator on Mac OS if the right tools aren't installed."
Joe Onorato [Wed, 25 Jul 2012 21:28:05 +0000 (14:28 -0700)]
Don't try to build the emulator on Mac OS if the right tools aren't installed.
Change-Id: I3cd2f82f9ee64174bddbb12a18ca8fcf23bdcebd
Andrew Hsieh [Wed, 25 Jul 2012 21:25:30 +0000 (14:25 -0700)]
am
b7391efb: Merge "Add -fuse-ld=bfd to x86 target"
* commit '
b7391efbf03d47876fd0747a5cf2199f6b4a503a':
Add -fuse-ld=bfd to x86 target
Nick Kralevich [Wed, 25 Jul 2012 21:25:28 +0000 (14:25 -0700)]
am
297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."
* commit '
297d6c02bc1e1c63404d8d81df28f3f13046fe85':
Add property_contexts to SELINUX_DEPENDS.
The Android Automerger [Wed, 25 Jul 2012 20:54:38 +0000 (13:54 -0700)]
JRO03K
Andrew Hsieh [Wed, 25 Jul 2012 20:40:30 +0000 (13:40 -0700)]
Merge "Add -fuse-ld=bfd to x86 target"
Andrew Hsieh [Wed, 25 Jul 2012 07:35:35 +0000 (00:35 -0700)]
Add -fuse-ld=bfd to x86 target
Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
Change-Id: Ie6fa0a2ddfc57b650552c8cf0891f738a5be0dda
Scott Main [Wed, 25 Jul 2012 05:01:18 +0000 (22:01 -0700)]
am
54d2a9b9: add bottom-margin to div-based notes
* commit '
54d2a9b9ec90d3e4697f7915a183d8cfcc7e20b0':
add bottom-margin to div-based notes
The Android Automerger [Wed, 25 Jul 2012 03:31:56 +0000 (20:31 -0700)]
JRO03J
The Android Automerger [Wed, 25 Jul 2012 03:23:28 +0000 (20:23 -0700)]
JRO24
The Android Automerger [Wed, 25 Jul 2012 03:23:07 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 25 Jul 2012 01:36:24 +0000 (18:36 -0700)]
JRO03I
Scott Main [Tue, 24 Jul 2012 21:54:32 +0000 (14:54 -0700)]
add bottom-margin to div-based notes
Change-Id: I4c74ab362b00bfb68093a975171f777e3fb5eef9
The Android Automerger [Tue, 24 Jul 2012 19:39:49 +0000 (12:39 -0700)]
JZO24
The Android Automerger [Tue, 24 Jul 2012 19:39:22 +0000 (12:39 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Scott Main [Mon, 23 Jul 2012 21:38:57 +0000 (14:38 -0700)]
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
Scott Main [Mon, 23 Jul 2012 21:34:34 +0000 (14:34 -0700)]
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
Ying Wang [Mon, 23 Jul 2012 17:32:54 +0000 (10:32 -0700)]
am
28437aac: Add LOCAL_SOURCE_FILES_ALL_GENERATED support
* commit '
28437aac999eb04d1698d9a6de87a25b5b772da6':
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
Ying Wang [Thu, 19 Jul 2012 21:38:43 +0000 (14:38 -0700)]
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
Scott Main [Thu, 19 Jul 2012 18:13:41 +0000 (11:13 -0700)]
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
Scott Main [Thu, 19 Jul 2012 18:03:41 +0000 (11:03 -0700)]
Merge "docs: further specify design docs' list styles to fix uls appearing like ols" into jb-dev
Scott Main [Thu, 19 Jul 2012 18:01:27 +0000 (11:01 -0700)]
docs: further specify design docs' list styles to fix uls appearing like ols
Change-Id: I203daeafb390532e34687338d5c3d4a307ba680f
The Android Open Source Project [Thu, 19 Jul 2012 15:35:48 +0000 (08:35 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b
The Android Automerger [Thu, 19 Jul 2012 04:45:08 +0000 (21:45 -0700)]
JZO18
The Android Automerger [Thu, 19 Jul 2012 04:44:37 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Scott Main [Thu, 19 Jul 2012 03:14:58 +0000 (20:14 -0700)]
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
Scott Main [Thu, 19 Jul 2012 03:14:03 +0000 (20:14 -0700)]
am
55163c88: Doc change: add links to the More menu.
* commit '
55163c882e8d97d48f58f8ac86c394ce07548d8c':
Doc change: add links to the More menu.
Scott Main [Wed, 18 Jul 2012 23:59:41 +0000 (16:59 -0700)]
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
Scott Main [Wed, 18 Jul 2012 23:53:22 +0000 (16:53 -0700)]
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
Scott Main [Wed, 18 Jul 2012 23:18:25 +0000 (16:18 -0700)]
Doc change: add links to the More menu.
Change-Id: I77e848f86278781b0a44eb672ea711e00352fde5
Nick Kralevich [Wed, 18 Jul 2012 20:55:09 +0000 (13:55 -0700)]
Merge "Add property_contexts to SELINUX_DEPENDS."
Scott Main [Tue, 17 Jul 2012 20:22:25 +0000 (13:22 -0700)]
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
Scott Main [Tue, 17 Jul 2012 20:15:12 +0000 (13:15 -0700)]
docs: bring back min-height for nav-x for proper height of secondary tabs
Change-Id: I865195b9fde9ec64fbe2c083c0d3617a55b54a0f
The Android Automerger [Tue, 17 Jul 2012 19:34:10 +0000 (12:34 -0700)]
JZO17
Wink Saville [Tue, 17 Jul 2012 19:33:21 +0000 (12:33 -0700)]
am
c4e790dc: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
* commit '
c4e790dc6474566799012728f9e67f5d794975b4':
Create telephony-common and mms-common - DO NOT MERGE
The Android Automerger [Tue, 17 Jul 2012 19:29:00 +0000 (12:29 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 17 Jul 2012 19:27:31 +0000 (12:27 -0700)]
JRO03H
Wink Saville [Sat, 30 Jun 2012 23:13:26 +0000 (16:13 -0700)]
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
Scott Main [Tue, 17 Jul 2012 01:38:14 +0000 (18:38 -0700)]
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.
Scott Main [Tue, 17 Jul 2012 00:14:40 +0000 (17:14 -0700)]
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
Scott Main [Mon, 16 Jul 2012 22:46:46 +0000 (15:46 -0700)]
am
220c3449: docs: adjust spacing for collapsible sections (release notes)
* commit '
220c34492ae24f79f9b4a4fe15051360c8505807':
docs: adjust spacing for collapsible sections (release notes)
Scott Main [Mon, 16 Jul 2012 22:40:17 +0000 (15:40 -0700)]
docs: adjust spacing for collapsible sections (release notes)
Change-Id: I68c8429e0e18bff50463b40f163df6a89ac8730a
The Android Automerger [Mon, 16 Jul 2012 19:15:57 +0000 (12:15 -0700)]
JRO03G
The Android Automerger [Fri, 13 Jul 2012 21:19:15 +0000 (14:19 -0700)]
JRO03F
The Android Automerger [Fri, 13 Jul 2012 20:38:41 +0000 (13:38 -0700)]
JRO03E
Jean-Baptiste Queru [Fri, 13 Jul 2012 19:13:54 +0000 (12:13 -0700)]
Merge
2f16ba59
Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc
The Android Automerger [Fri, 13 Jul 2012 00:26:25 +0000 (17:26 -0700)]
JRO03D
Justin Ho [Thu, 12 Jul 2012 23:21:00 +0000 (16:21 -0700)]
Android 4.1.2 version bump
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
The Android Automerger [Thu, 12 Jul 2012 06:17:54 +0000 (23:17 -0700)]
JZO11
The Android Automerger [Thu, 12 Jul 2012 06:16:01 +0000 (23:16 -0700)]
JZO10
The Android Automerger [Thu, 12 Jul 2012 06:11:59 +0000 (23:11 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Guang Zhu [Thu, 12 Jul 2012 02:36:17 +0000 (19:36 -0700)]
resolved conflicts for merge of
ef1335ed to jb-dev-plus-aosp
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
Guang Zhu [Thu, 12 Jul 2012 01:35:08 +0000 (18:35 -0700)]
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
Wink Saville [Sat, 30 Jun 2012 23:13:26 +0000 (16:13 -0700)]
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
rpcraig [Thu, 5 Jul 2012 14:50:27 +0000 (10:50 -0400)]
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
The Android Open Source Project [Wed, 4 Jul 2012 23:48:36 +0000 (16:48 -0700)]
Reconcile with jb-release
Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da
The Android Automerger [Wed, 4 Jul 2012 20:53:25 +0000 (13:53 -0700)]
JRO03C
Scott Main [Tue, 3 Jul 2012 21:15:43 +0000 (14:15 -0700)]
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
Scott Main [Tue, 3 Jul 2012 21:10:57 +0000 (14:10 -0700)]
Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
The Android Open Source Project [Tue, 3 Jul 2012 21:09:18 +0000 (14:09 -0700)]
Reconcile with jb-release
Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec