OSDN Git Service
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
The Android Automerger [Sat, 23 Jun 2012 01:28:32 +0000 (18:28 -0700)]
JRN83C
The Android Automerger [Sat, 23 Jun 2012 01:19:02 +0000 (18:19 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Sat, 23 Jun 2012 00:02:25 +0000 (17:02 -0700)]
docs: update sdk template to support new ndk doc layout
Change-Id: I47ec2fcd4b7116fa3dc59483a434d7f188f984d1
The Android Open Source Project [Fri, 22 Jun 2012 22:22:01 +0000 (15:22 -0700)]
am
758a52dd: Reconcile with jb-release
* commit '
758a52dddec379d432ffcdef40f132af273e0ecd':
JRN83B
The Android Open Source Project [Fri, 22 Jun 2012 22:20:06 +0000 (15:20 -0700)]
Reconcile with jb-release
Change-Id: I4a8336fb66821c570245f75901919ef6b1b9c641
The Android Automerger [Fri, 22 Jun 2012 22:14:06 +0000 (15:14 -0700)]
JRN83B
The Android Automerger [Fri, 22 Jun 2012 22:03:34 +0000 (15:03 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Fri, 22 Jun 2012 21:36:33 +0000 (14:36 -0700)]
docs: style changes for notes
Change-Id: I13bc3f19780421a30feffc6e6ffe19cfadc886e5
Jean-Baptiste Queru [Fri, 22 Jun 2012 21:32:49 +0000 (14:32 -0700)]
am
4a65f812: am
6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"
* commit '
4a65f812373e1ecfa6e7058d635e998429a4cf17':
Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
Jean-Baptiste Queru [Fri, 22 Jun 2012 21:31:05 +0000 (14:31 -0700)]
am
6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"
* commit '
6e587f53152127370c6b45204f6529dd7b0ce32a':
Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
Jean-Baptiste Queru [Fri, 22 Jun 2012 20:47:19 +0000 (13:47 -0700)]
Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"
The Android Open Source Project [Fri, 22 Jun 2012 19:39:24 +0000 (12:39 -0700)]
am
ec0f69a8: Reconcile with jb-release
* commit '
ec0f69a81a4a8ce1c424ec5f4768e86548300891':
JRN83
The Android Open Source Project [Fri, 22 Jun 2012 19:37:02 +0000 (12:37 -0700)]
Reconcile with jb-release
Change-Id: I8e514e78efc61e6d7cab247e3c6979a6459bcd55
Scott Main [Fri, 22 Jun 2012 17:34:06 +0000 (10:34 -0700)]
am
84e518eb: am
f9b799b5: cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
* commit '
84e518ebcd0e9edd4b27ea5f7be181d4532e88b5':
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
Scott Main [Fri, 22 Jun 2012 17:31:44 +0000 (10:31 -0700)]
am
f9b799b5: cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
* commit '
f9b799b5ba0ed5d06c8bf442ddd4319c93fbc95f':
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
Scott Main [Fri, 22 Jun 2012 17:25:52 +0000 (10:25 -0700)]
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df
return old analytics script
Change-Id: Ica4abe000b529272efa9ba7867b3e7aa6c8c9e55
The Android Automerger [Fri, 22 Jun 2012 17:01:55 +0000 (10:01 -0700)]
JRN83
The Android Automerger [Fri, 22 Jun 2012 16:47:02 +0000 (09:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Fri, 22 Jun 2012 15:18:23 +0000 (08:18 -0700)]
am
fa90185a: Reconcile with jb-release
* commit '
fa90185a339f6b55897d529c62cc4a541ccb7d6f':
JRN82C
JRN82B
JRN82
JRN81C
JRN81B
The Android Open Source Project [Fri, 22 Jun 2012 15:16:45 +0000 (08:16 -0700)]
Reconcile with jb-release
Change-Id: I75d44aea2008be774afc674fda49c2220583080d
Scott Main [Fri, 22 Jun 2012 04:35:28 +0000 (21:35 -0700)]
am
d86c00b6: am
e4d8f1b1: Massive clobber of all template files in developer site for new design
* commit '
d86c00b66666b700afac0b2396e2d81e583bd0ef':
Massive clobber of all template files in developer site for new design
Scott Main [Fri, 22 Jun 2012 04:32:44 +0000 (21:32 -0700)]
am
e4d8f1b1: Massive clobber of all template files in developer site for new design
* commit '
e4d8f1b1f5a6e2308bfeff04d7fa51ff7394c644':
Massive clobber of all template files in developer site for new design
Scott Main [Fri, 22 Jun 2012 01:03:05 +0000 (18:03 -0700)]
Massive clobber of all template files in developer site for new design
Change-Id: I5f243dcb377a8b2e573c404a9e685cc64e0e06d2
The Android Automerger [Fri, 22 Jun 2012 00:58:04 +0000 (17:58 -0700)]
JRN82C
The Android Automerger [Fri, 22 Jun 2012 00:47:30 +0000 (17:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 21:27:43 +0000 (14:27 -0700)]
JRN82B
The Android Automerger [Thu, 21 Jun 2012 21:16:15 +0000 (14:16 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 14:09:05 +0000 (07:09 -0700)]
JRN82
The Android Automerger [Thu, 21 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 01:27:28 +0000 (18:27 -0700)]
JRN81C
The Android Automerger [Wed, 20 Jun 2012 22:46:52 +0000 (15:46 -0700)]
JRN81B
Keun young Park [Wed, 20 Jun 2012 16:47:12 +0000 (09:47 -0700)]
Merge "replace development/data/etc/ to device/generic/goldfish/data/etc"
The Android Open Source Project [Wed, 20 Jun 2012 15:28:16 +0000 (08:28 -0700)]
am
da21229d: Reconcile with jb-release
* commit '
da21229d7b5ff4993a1efbe603e2e971da96e6b4':
JRN81
JRN80C
JRN80B
The Android Open Source Project [Wed, 20 Jun 2012 15:25:33 +0000 (08:25 -0700)]
Reconcile with jb-release
Change-Id: I71f037e68eda652f71ce7a15e4afff031adbd913
The Android Automerger [Wed, 20 Jun 2012 14:09:13 +0000 (07:09 -0700)]
JRN81
The Android Automerger [Wed, 20 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Keun young Park [Wed, 20 Jun 2012 01:02:22 +0000 (18:02 -0700)]
replace development/data/etc/ to device/generic/goldfish/data/etc
- Files under development/data/etc will be removed
Change-Id: I39907cda9b3253f1608ed3231a8a9945087348d7
The Android Automerger [Tue, 19 Jun 2012 23:30:09 +0000 (16:30 -0700)]
JRN80C
Ying Wang [Tue, 19 Jun 2012 21:33:09 +0000 (14:33 -0700)]
resolved conflicts for merge of
9b76c054 to master
Change-Id: I4190ef6895b7ddb27d9a293cbacecdef1f4f20b8
Ying Wang [Tue, 19 Jun 2012 21:27:31 +0000 (14:27 -0700)]
am
0872a010: Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
* commit '
0872a010659d20633f07f4ef54cf61f8e4b6e030':
More flexibility to keep/remove R.class in static Java library
Ying Wang [Tue, 19 Jun 2012 21:25:14 +0000 (14:25 -0700)]
Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
OSDN Git Service
