OSDN Git Service
Jean-Baptiste Queru [Fri, 13 Jul 2012 19:16:38 +0000 (12:16 -0700)]
Jean-Baptiste Queru [Fri, 13 Jul 2012 19:13:54 +0000 (12:13 -0700)]
Merge
2f16ba59
Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc
Justin Ho [Thu, 12 Jul 2012 23:21:00 +0000 (16:21 -0700)]
Android 4.1.2 version bump
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
Guang Zhu [Thu, 12 Jul 2012 16:36:35 +0000 (09:36 -0700)]
am
96d9fa29: resolved conflicts for merge of
ef1335ed to jb-dev-plus-aosp
* commit '
96d9fa29cd1ff48b733eb090e99fe165d194d313':
use default shell (mksh) in emulator
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 [Thu, 12 Jul 2012 01:08:21 +0000 (18:08 -0700)]
Merge commit '
c16c9454' into mit
* commit '
c16c9454':
Create telephony-common and mms-common
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
The Android Open Source Project [Wed, 4 Jul 2012 23:49:44 +0000 (16:49 -0700)]
am
69cfe57a: Reconcile with jb-release
* commit '
69cfe57ae5b0dd7aaab924df38bddee131cba2a5':
JRO03C
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
Doug Zongker [Tue, 3 Jul 2012 22:57:57 +0000 (15:57 -0700)]
Merge "make SignApk faster for OTA packages"
Doug Zongker [Tue, 3 Jul 2012 22:03:04 +0000 (15:03 -0700)]
make SignApk faster for OTA packages
Change to the default compression level instead of the max compression
level for OTA packages (-w): it's much faster and the difference in
output size is usually negligible.
Bug:
6778962
Change-Id: I82a6acc19be8b3289fd84c8c15f03ebeb7a1ce63
Scott Main [Tue, 3 Jul 2012 21:18:10 +0000 (14:18 -0700)]
am
a4d57eab: am
38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
* commit '
a4d57eab27139af93ecdb4b0eb8ec8c5193b7c80':
docs: fix search suggestions and other script bugs for offline docs
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
The Android Open Source Project [Tue, 3 Jul 2012 21:11:45 +0000 (14:11 -0700)]
am
cb2657d3: Reconcile with jb-release
* commit '
cb2657d378d90e2375bdf8a15e35ec1de70ef67b':
JRO03B
4.1.1
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
Jean-Baptiste Queru [Tue, 3 Jul 2012 21:09:05 +0000 (14:09 -0700)]
am
f17d1b34: Ignore version change from jb-dev
* commit '
f17d1b34d3b109796492459dfe78530b6d04b967':
4.1.1
Scott Main [Tue, 3 Jul 2012 21:06:22 +0000 (14:06 -0700)]
docs: fix search suggestions and other script bugs for offline docs
Change-Id: I3f9404695966b99be1c8ed36249788e448399296
Jean-Baptiste Queru [Tue, 3 Jul 2012 21:04:28 +0000 (14:04 -0700)]
Ignore version change from jb-dev
Change-Id: Ia04c4664cba4abdef04f0949713f4c76281713d8
The Android Automerger [Tue, 3 Jul 2012 21:00:39 +0000 (14:00 -0700)]
JRO03B
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
Ed Heyl [Tue, 3 Jul 2012 20:57:52 +0000 (13:57 -0700)]
Merge "4.1.1" into jb-dev
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
The Android Open Source Project [Tue, 3 Jul 2012 20:33:11 +0000 (13:33 -0700)]
am
9c94579f: Reconcile with jb-release
* commit '
9c94579f0e2a345b01685ac3decf7f3d11f763f4':
JRO02D
The Android Open Source Project [Tue, 3 Jul 2012 20:30:52 +0000 (13:30 -0700)]
Reconcile with jb-release
Change-Id: I23dd2b4acc6d2ca20756d6d674272a2721843d20
The Android Automerger [Tue, 3 Jul 2012 19:58:46 +0000 (12:58 -0700)]
JRO02D
The Android Automerger [Tue, 3 Jul 2012 19:50:47 +0000 (12:50 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Tue, 3 Jul 2012 19:20:50 +0000 (12:20 -0700)]
am
9ffe27e0: am
9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."
* commit '
9ffe27e013c84e036d5e38b02edf3ca12f7405a8':
This property is set when HAVE_SELINUX:=true during build.
Ying Wang [Tue, 3 Jul 2012 19:16:03 +0000 (12:16 -0700)]
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.
The Android Open Source Project [Tue, 3 Jul 2012 19:14:19 +0000 (12:14 -0700)]
am
14c31bdc: Reconcile with jb-release
* commit '
14c31bdc30d115113575b75abfe01a639a3a6a12':
JRO02C
JRO02B
JRO02
The Android Open Source Project [Tue, 3 Jul 2012 19:11:41 +0000 (12:11 -0700)]
Reconcile with jb-release
Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11
Ying Wang [Tue, 3 Jul 2012 18:30:30 +0000 (11:30 -0700)]
Merge "This property is set when HAVE_SELINUX:=true during build."
William Roberts [Tue, 3 Jul 2012 01:55:14 +0000 (18:55 -0700)]
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
The Android Automerger [Tue, 3 Jul 2012 02:03:14 +0000 (19:03 -0700)]
JRO02C
The Android Automerger [Tue, 3 Jul 2012 01:58:01 +0000 (18:58 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 23:25:03 +0000 (16:25 -0700)]
JRO02B
The Android Automerger [Mon, 2 Jul 2012 23:16:18 +0000 (16:16 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 20:00:27 +0000 (13:00 -0700)]
JRO02
The Android Automerger [Mon, 2 Jul 2012 19:53:12 +0000 (12:53 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 30 Jun 2012 03:22:20 +0000 (20:22 -0700)]
am
d512fda4: am
e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
* commit '
d512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259':
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
Ying Wang [Sat, 30 Jun 2012 03:19:50 +0000 (20:19 -0700)]
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
Ying Wang [Sat, 30 Jun 2012 02:55:06 +0000 (19:55 -0700)]
Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
The Android Open Source Project [Sat, 30 Jun 2012 01:30:23 +0000 (18:30 -0700)]
am
5081af57: Reconcile with jb-release
* commit '
5081af57d369e1e6de09f67836bff0d40cda711e':
JRN90
The Android Open Source Project [Sat, 30 Jun 2012 01:28:17 +0000 (18:28 -0700)]
Reconcile with jb-release
Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25
The Android Automerger [Fri, 29 Jun 2012 22:57:58 +0000 (15:57 -0700)]
JRN90
The Android Automerger [Fri, 29 Jun 2012 22:47:16 +0000 (15:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Fri, 29 Jun 2012 15:16:22 +0000 (08:16 -0700)]
am
8ef65998: Reconcile with jb-release
* commit '
8ef65998f4025378eda0cec70ff38a1b8a5633db':
JRN89B
JRN89
JRN88
JRN87
The Android Open Source Project [Fri, 29 Jun 2012 15:13:34 +0000 (08:13 -0700)]
Reconcile with jb-release
Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc
The Android Automerger [Fri, 29 Jun 2012 00:16:17 +0000 (17:16 -0700)]
JRN89B
The Android Automerger [Fri, 29 Jun 2012 00:06:01 +0000 (17:06 -0700)]
merge in jb-release history after reset to jb-dev
Marc Blank [Thu, 28 Jun 2012 23:55:57 +0000 (16:55 -0700)]
Change build targets to use Email2/Exchange2
Change-Id: I1b93b112b4d31ce379d33e2d1202fc90bb8d21eb
Ying Wang [Thu, 28 Jun 2012 23:02:19 +0000 (16:02 -0700)]
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
Scott Main [Thu, 28 Jun 2012 19:06:35 +0000 (12:06 -0700)]
am
082ca3f2: am
f973ced3: docs: better message for download page when os detection fails
* commit '
082ca3f2de07ee6183343452a35f4afe2cdb7f3d':
docs: better message for download page when os detection fails
Scott Main [Thu, 28 Jun 2012 19:01:03 +0000 (12:01 -0700)]
am
f973ced3: docs: better message for download page when os detection fails
* commit '
f973ced37e2d065c0aa41bb5563abad7518bea61':
docs: better message for download page when os detection fails
Scott Main [Thu, 28 Jun 2012 18:56:01 +0000 (11:56 -0700)]
docs: better message for download page when os detection fails
Change-Id: I940c0847ddc214ef36bfd0708d289cff200dfc62
The Android Automerger [Thu, 28 Jun 2012 14:08:48 +0000 (07:08 -0700)]
JRN89
The Android Automerger [Thu, 28 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 27 Jun 2012 21:15:09 +0000 (14:15 -0700)]
JRN88
The Android Automerger [Wed, 27 Jun 2012 21:04:29 +0000 (14:04 -0700)]
merge in jb-release history after reset to jb-dev
Steve Block [Wed, 27 Jun 2012 16:02:39 +0000 (09:02 -0700)]
Merge "Don't fail if a target of type NONE has a NOTICE file present"
Steve Block [Wed, 27 Jun 2012 00:07:19 +0000 (01:07 +0100)]
Don't fail if a target of type NONE has a NOTICE file present
Targets of type NONE are used extensively in Android makefiles which have been
auto-generated from gyp build files. The gyp generator uses such targets to
represent gyp targets which don't produce an output file. Typically, many such
targets exist in a single Android makefile.
We use a generated Android makefile for Chromium. This project has a NOTICE
file, intended to be installed with a SHARED_LIBRARY target. However, the build
fails when processing the targets of type NONE, as it does not know where
to install the NOTICE file.
This change causes the NOTICE to be ignored in this case, rather than failing
the build.
Change-Id: I70cf9a406e4a1c932f8a734f53491f7c5281ee17
Scott Main [Wed, 27 Jun 2012 09:27:29 +0000 (02:27 -0700)]
am
3fa1173a: 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 '
3fa1173ac3a24214a6f8bc5e6cf9794226110f9b':
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.
Scott Main [Wed, 27 Jun 2012 09:25:12 +0000 (02:25 -0700)]
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.
Scott Main [Wed, 27 Jun 2012 09:08:20 +0000 (02:08 -0700)]
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
Scott Main [Wed, 27 Jun 2012 05:28:46 +0000 (22:28 -0700)]
Scott Main [Wed, 27 Jun 2012 05:26:18 +0000 (22:26 -0700)]
Scott Main [Wed, 27 Jun 2012 05:23:22 +0000 (22:23 -0700)]
docs: misc css
Change-Id: I398d30f9414564f58ea3546a192ad1c12e715349
Stephen Hines [Tue, 26 Jun 2012 23:38:21 +0000 (16:38 -0700)]
Disable libcompiler-rt-extras for BUILD_TINY_ANDROID.
Change-Id: I05aa9e43f987ef422d98f43b3734dfbc261feb4b
The Android Automerger [Tue, 26 Jun 2012 18:15:56 +0000 (11:15 -0700)]
JRN87
The Android Automerger [Tue, 26 Jun 2012 18:07:24 +0000 (11:07 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 26 Jun 2012 14:21:16 +0000 (07:21 -0700)]
am
90d6a637: Reconcile with jb-release
* commit '
90d6a637dc04a66d0833ebe4e30ff6ff1332da40':
JRN84D
JRN84C
The Android Open Source Project [Tue, 26 Jun 2012 14:18:15 +0000 (07:18 -0700)]
Reconcile with jb-release
Change-Id: Iab5346490b6838a2137ffd28e72e4f8d4e9f48da
The Android Automerger [Tue, 26 Jun 2012 00:24:56 +0000 (17:24 -0700)]
JRN84D
The Android Automerger [Tue, 26 Jun 2012 00:14:15 +0000 (17:14 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 26 Jun 2012 00:05:30 +0000 (17:05 -0700)]
JRN84C
The Android Open Source Project [Mon, 25 Jun 2012 19:21:20 +0000 (12:21 -0700)]
am
4af7837e: Reconcile with jb-release
* commit '
4af7837eac062cc96958be2981a39274a497f555':
JRN84B
JRN86
The Android Open Source Project [Mon, 25 Jun 2012 19:18:24 +0000 (12:18 -0700)]
Reconcile with jb-release
Change-Id: I2b5cf5780851a3979016a50ff39f7da6d6d1a82b
The Android Automerger [Mon, 25 Jun 2012 18:31:30 +0000 (11:31 -0700)]
JRN84B
The Android Automerger [Mon, 25 Jun 2012 18:29:39 +0000 (11:29 -0700)]
JRN86
The Android Open Source Project [Mon, 25 Jun 2012 15:00:16 +0000 (08:00 -0700)]
am
ad7c32bf: Reconcile with jb-release
* commit '
ad7c32bf2cdc135b827d60f5ce7a77b50b576395':
JRN84
JRN83D
JRN83C
The Android Open Source Project [Mon, 25 Jun 2012 14:57:11 +0000 (07:57 -0700)]
Reconcile with jb-release
Change-Id: I80e21c4019904a7f755af426e3e29e41c9b23f78
The Android Automerger [Sun, 24 Jun 2012 06:28:18 +0000 (23:28 -0700)]
JRN84
The Android Automerger [Sun, 24 Jun 2012 06:13:39 +0000 (23:13 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Sun, 24 Jun 2012 00:55:26 +0000 (17:55 -0700)]
am
c60a1430: am
9ada2264: docs: darker font color
* commit '
c60a1430dcfc7e8ae25b31800620c833a427895a':
docs: darker font color
Scott Main [Sun, 24 Jun 2012 00:52:58 +0000 (17:52 -0700)]
am
9ada2264: docs: darker font color
* commit '
9ada22647890c18ded2b890d00c0a307bd2bed98':
docs: darker font color
Scott Main [Sat, 23 Jun 2012 21:59:36 +0000 (14:59 -0700)]
docs: darker font color
Change-Id: I8fe4117ac501001dd6c7156b337f3ff7a4f75793
Scott Main [Sat, 23 Jun 2012 18:27:00 +0000 (11:27 -0700)]
am
46601e37: am
6a7a66be: docs: try darker text and shorter line height
* commit '
46601e379201f6e14be9ec1f7f170e633430344a':
docs: try darker text and shorter line height
Scott Main [Sat, 23 Jun 2012 18:25:21 +0000 (11:25 -0700)]
am
6a7a66be: docs: try darker text and shorter line height
* commit '
6a7a66beba12d6e655f3dde257a3e4964f8ad0c7':
docs: try darker text and shorter line height
Scott Main [Sat, 23 Jun 2012 18:20:48 +0000 (11:20 -0700)]
docs: try darker text and shorter line height
Change-Id: I7fe3cdc0a0f5cdfd8bcb69b1e1a2d11d8b5301d3
Scott Main [Sat, 23 Jun 2012 12:39:13 +0000 (05:39 -0700)]
am
aeda97cb: am
d786a29f: docs: adjust homepage carousel styles
* commit '
aeda97cb22f64badf50bf31ca11e4f32418fc6d8':
docs: adjust homepage carousel styles
Scott Main [Sat, 23 Jun 2012 12:39:13 +0000 (05:39 -0700)]
am
ac432bc9: am
25659b02: docs: update sdk template to support new ndk doc layout
* commit '
ac432bc99516543889c007a2eb09aa64afd5fdc0':
docs: update sdk template to support new ndk doc layout
Scott Main [Sat, 23 Jun 2012 12:39:12 +0000 (05:39 -0700)]
am
04977dbb: am
412eaf20: docs: style changes for notes
* commit '
04977dbbb61af360c6c0efea9accdb12cf2a3598':
docs: style changes for notes
Scott Main [Sat, 23 Jun 2012 12:37:01 +0000 (05:37 -0700)]
am
d786a29f: docs: adjust homepage carousel styles
* commit '
d786a29f14c502986ffc160471daedfd0b5fb5dc':
docs: adjust homepage carousel styles
Scott Main [Sat, 23 Jun 2012 12:37:01 +0000 (05:37 -0700)]
am
25659b02: docs: update sdk template to support new ndk doc layout
* commit '
25659b0217cca1389b2711ee536547b20b266319':
docs: update sdk template to support new ndk doc layout
Scott Main [Sat, 23 Jun 2012 12:36:51 +0000 (05:36 -0700)]
am
412eaf20: docs: style changes for notes
* commit '
412eaf202c63b8d2cc32b5b865ba29155e047697':
docs: style changes for notes
Scott Main [Sat, 23 Jun 2012 04:23:32 +0000 (21:23 -0700)]
docs: adjust homepage carousel styles
Change-Id: Id2b32ce67d26a19b40e7944a5dd37cd17d8eec2a
The Android Automerger [Sat, 23 Jun 2012 03:41:01 +0000 (20:41 -0700)]
JRN83D
The Android Automerger [Sat, 23 Jun 2012 03:37:07 +0000 (20:37 -0700)]
merge in jb-release history after reset to jb-dev