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
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
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
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
c14ec30c43
JZO17
2012-07-17 12:34:10 -07:00
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
5bcd6b4be9
merge in jb-mr0-release history after reset to jb-dev
2012-07-17 12:29:00 -07:00
516c242b31
JRO03H
2012-07-17 12:27:31 -07:00
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
f34a9bac0e
core/Makefile: also look for device/*/build/tasks
...
This eases cross-repo dependencies between device/ and
vendor/.
Change-Id: I72e283d22f16e50555ec7ba7bcf9c61ea07f083c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-07-17 10:22:30 -07:00
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
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
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
220c34492a
docs: adjust spacing for collapsible sections (release notes)
...
Change-Id: I68c8429e0e18bff50463b40f163df6a89ac8730a
2012-07-16 15:40:17 -07:00
eb5cbb97f7
JRO03G
2012-07-16 12:15:57 -07:00
20f8a0adac
JRO03F
2012-07-13 14:19:15 -07:00
915b91599e
JRO03E
2012-07-13 13:38:41 -07:00
938cf057c5
Merge 2f16ba59
...
Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc
2012-07-13 12:14:04 -07:00
a882cd9b8d
JRO03D
2012-07-12 17:26:25 -07:00
2f16ba5997
Android 4.1.2 version bump
...
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
2012-07-12 16:21:00 -07:00
b71a27bae5
JZO11
2012-07-11 23:17:54 -07:00
40d7329ba6
JZO10
2012-07-11 23:16:01 -07:00
832de9cee3
merge in jb-mr0-release history after reset to jb-dev
2012-07-11 23:11:59 -07:00
96d9fa29cd
resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
...
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
2012-07-11 19:36:17 -07:00
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
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
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
69cfe57ae5
Reconcile with jb-release
...
Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da
2012-07-04 16:48:36 -07:00
39865ff7ed
JRO03C
2012-07-04 13:53:25 -07:00
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
38f19c2125
Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
2012-07-03 14:10:57 -07:00
cb2657d378
Reconcile with jb-release
...
Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec
2012-07-03 14:09:18 -07:00
1b3db11e6e
docs: fix search suggestions and other script bugs for offline docs
...
Change-Id: I3f9404695966b99be1c8ed36249788e448399296
2012-07-03 14:06:22 -07:00
f17d1b34d3
Ignore version change from jb-dev
...
Change-Id: Ia04c4664cba4abdef04f0949713f4c76281713d8
2012-07-03 14:04:38 -07:00
7f8c15f778
JRO03B
2012-07-03 14:00:39 -07:00
b435a8c322
4.1.1
...
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
2012-07-03 14:00:39 -07:00
c4c39f4d01
Merge "4.1.1" into jb-dev
2012-07-03 13:57:52 -07:00
952f55e7ae
4.1.1
...
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
2012-07-03 13:54:49 -07:00
9c94579f0e
Reconcile with jb-release
...
Change-Id: I23dd2b4acc6d2ca20756d6d674272a2721843d20
2012-07-03 13:30:52 -07:00
95497ec614
JRO02D
2012-07-03 12:58:46 -07:00
eba6d7df71
merge in jb-release history after reset to jb-dev
2012-07-03 12:50:47 -07:00
9ffe27e013
am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."
...
* commit '9e38d6bf1bf78a00d8f4288e6444be358a70a692':
This property is set when HAVE_SELINUX:=true during build.
2012-07-03 12:16:03 -07:00
14c31bdc30
Reconcile with jb-release
...
Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11
2012-07-03 12:11:41 -07:00
9e38d6bf1b
Merge "This property is set when HAVE_SELINUX:=true during build."
2012-07-03 11:30:30 -07:00
9d8a51f537
This property is set when HAVE_SELINUX:=true during build.
...
This will provide a convenient method for determing build
configuration when in the Java layer. For instance, this will
be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68
to determine if the Settings app should display the SE Linux
status.
Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f
2012-07-03 11:05:03 -07:00
Scott Main