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
Jean-Baptiste Queru
938cf057c5
Merge 2f16ba59
...
Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc
2012-07-13 12:14:04 -07:00
Justin Ho
2f16ba5997
Android 4.1.2 version bump
...
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
2012-07-12 16:21:00 -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
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
The Android Open Source Project
cb2657d378
Reconcile with jb-release
...
Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec
2012-07-03 14:09:18 -07:00
Scott Main
1b3db11e6e
docs: fix search suggestions and other script bugs for offline docs
...
Change-Id: I3f9404695966b99be1c8ed36249788e448399296
2012-07-03 14:06:22 -07:00
Jean-Baptiste Queru
f17d1b34d3
Ignore version change from jb-dev
...
Change-Id: Ia04c4664cba4abdef04f0949713f4c76281713d8
2012-07-03 14:04:38 -07:00
The Android Automerger
7f8c15f778
JRO03B
2012-07-03 14:00:39 -07:00
Ed Heyl
b435a8c322
4.1.1
...
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
2012-07-03 14:00:39 -07:00
Ed Heyl
c4c39f4d01
Merge "4.1.1" into jb-dev
2012-07-03 13:57:52 -07:00
Ed Heyl
952f55e7ae
4.1.1
...
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
2012-07-03 13:54:49 -07:00
The Android Open Source Project
9c94579f0e
Reconcile with jb-release
...
Change-Id: I23dd2b4acc6d2ca20756d6d674272a2721843d20
2012-07-03 13:30:52 -07:00
The Android Automerger
95497ec614
JRO02D
2012-07-03 12:58:46 -07:00
The Android Automerger
eba6d7df71
merge in jb-release history after reset to jb-dev
2012-07-03 12:50:47 -07:00
Ying Wang
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
The Android Open Source Project
14c31bdc30
Reconcile with jb-release
...
Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11
2012-07-03 12:11:41 -07:00
Ying Wang
9e38d6bf1b
Merge "This property is set when HAVE_SELINUX:=true during build."
2012-07-03 11:30:30 -07:00
William Roberts
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
The Android Automerger
b04e93207d
JRO02C
2012-07-02 19:03:14 -07:00
The Android Automerger
09cb8f135c
merge in jb-release history after reset to jb-dev
2012-07-02 18:58:01 -07:00
The Android Automerger
4a3e68d3fd
JRO02B
2012-07-02 16:25:03 -07:00
The Android Automerger
41576e9323
merge in jb-release history after reset to jb-dev
2012-07-02 16:16:18 -07:00
The Android Automerger
2513bf5161
JRO02
2012-07-02 13:00:27 -07:00
The Android Automerger
9a1d446ec2
merge in jb-release history after reset to jb-dev
2012-07-02 12:53:12 -07:00
Ying Wang
d512fda4ae
am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
...
* commit 'e42ed0ba1571f20866609710ba7c73fd138c0405':
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
2012-06-29 20:19:50 -07:00
Ying Wang
e42ed0ba15
Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
2012-06-29 19:55:07 -07:00
The Android Open Source Project
5081af57d3
Reconcile with jb-release
...
Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25
2012-06-29 18:28:17 -07:00
The Android Automerger
792ba3b87f
JRN90
2012-06-29 15:57:58 -07:00
The Android Automerger
223ef2b0e5
merge in jb-release history after reset to jb-dev
2012-06-29 15:47:16 -07:00
The Android Open Source Project
8ef65998f4
Reconcile with jb-release
...
Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc
2012-06-29 08:13:34 -07:00
The Android Automerger
e0e910e69a
JRN89B
2012-06-28 17:16:17 -07:00
The Android Automerger
f8997fa5a8
merge in jb-release history after reset to jb-dev
2012-06-28 17:06:01 -07:00
Ying Wang
478ba5e3f0
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
...
Bug: 6754632
So the warning won't show up when you run lunch.
Now the warning only shows when you do a clean build.
Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7
2012-06-28 16:02:19 -07:00
Scott Main
082ca3f2de
am f973ced3: docs: better message for download page when os detection fails
...
* commit 'f973ced37e2d065c0aa41bb5563abad7518bea61':
docs: better message for download page when os detection fails
2012-06-28 12:01:03 -07:00
Scott Main
f973ced37e
docs: better message for download page when os detection fails
...
Change-Id: I940c0847ddc214ef36bfd0708d289cff200dfc62
2012-06-28 11:56:01 -07:00
The Android Automerger
bbd80f66c2
JRN89
2012-06-28 07:08:48 -07:00
The Android Automerger
c1a0db1f36
merge in jb-release history after reset to jb-dev
2012-06-28 06:59:25 -07:00
The Android Automerger
28fe266131
JRN88
2012-06-27 14:15:09 -07:00
The Android Automerger
e3d441e49b
merge in jb-release history after reset to jb-dev
2012-06-27 14:04:29 -07:00
Scott Main
3fa1173ac3
am 810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it\'s a worthwhile compromise and will investigate a diff solution for that later.
...
* commit '810e28891457af6e365b839ac584d77277b2e3fa':
docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it's a worthwhile compromise and will investigate a diff solution for that later.
2012-06-27 02:25:12 -07:00
Scott Main
810e288914
docs: fix overlapping sidebar bug,
...
but I think this re-introduces a bug in IE where the sidenav
position moves slightly left/right during scroll, but it's a
worthwhile compromise and will investigate a diff solution for that later.
Change-Id: Id1f2141b6638e199d1a4ad1d198a5a5aa45bf264
2012-06-27 02:08:20 -07:00
Scott Main
dfc602e0d9
am 03c972c5: docs: misc css
...
* commit '03c972c5c6d42597c8fe0127161d6536ee98d04b':
docs: misc css
2012-06-26 22:26:18 -07:00
Scott Main
03c972c5c6
docs: misc css
...
Change-Id: I398d30f9414564f58ea3546a192ad1c12e715349
2012-06-26 22:23:22 -07:00
