OSDN Git Service
Jean-Baptiste Queru [Mon, 25 Feb 2013 21:01:48 +0000 (21:01 +0000)]
Merge "Fixed error message for using OpenJDK."
Tim Roes [Sat, 23 Feb 2013 19:25:00 +0000 (20:25 +0100)]
Fixed error message for using OpenJDK.
Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".
Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
Nick Kralevich [Sat, 23 Feb 2013 02:04:55 +0000 (02:04 +0000)]
Merge "build: update fs_config calls for capabilities change."
Ying Wang [Fri, 22 Feb 2013 18:03:15 +0000 (18:03 +0000)]
Merge "[MIPS] Update build rules"
Ying Wang [Fri, 22 Feb 2013 18:02:04 +0000 (18:02 +0000)]
Merge "We shouldn't use temporary variable in the build recipe."
Ying Wang [Fri, 22 Feb 2013 17:59:17 +0000 (09:59 -0800)]
We shouldn't use temporary variable in the build recipe.
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
Nick Kralevich [Wed, 20 Feb 2013 20:43:51 +0000 (12:43 -0800)]
build: update fs_config calls for capabilities change.
Change-Id: Ic3c94f990c34a56d84f01c151f1b64f419e16419
Chris Dearman [Thu, 15 Nov 2012 02:45:47 +0000 (18:45 -0800)]
[MIPS] Update build rules
Add -D_FORTIFY_SOURCE=1 to the default cflags
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Use single dash version of -print-whatever
compile everything with relro / bind_now
Enable NX protections
Some other cleanups to reduce differences between ARM and MIPS config files
Change-Id: I30b4de449e6353b581ef7f9437a3bb9be53d5bbf
Signed-off-by: Chris Dearman <chris@mips.com>
Ying Wang [Fri, 15 Feb 2013 22:51:05 +0000 (22:51 +0000)]
Merge "[MIPS] Use mksh for /system/bin/sh"
Chris Dearman [Wed, 14 Nov 2012 02:18:59 +0000 (18:18 -0800)]
[MIPS] Use mksh for /system/bin/sh
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I01a6c1e2ac9de5b6d86c2aace041a0f7400f6b5e
Ying Wang [Fri, 15 Feb 2013 19:33:59 +0000 (19:33 +0000)]
Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang."
Elliott Hughes [Fri, 15 Feb 2013 00:22:52 +0000 (00:22 +0000)]
Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
Elliott Hughes [Thu, 14 Feb 2013 20:04:48 +0000 (12:04 -0800)]
Remove more always-true ARCH_ARM_HAVE_ flags.
All the remaining flags appear to be actually used.
Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
Elliott Hughes [Thu, 14 Feb 2013 00:52:52 +0000 (00:52 +0000)]
Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS."
Elliott Hughes [Wed, 13 Feb 2013 23:03:41 +0000 (15:03 -0800)]
Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
Because every ARM architecture we've ever supported has had both.
Change-Id: I607b56416e65073c5ac1b85fb17c092516e02573
Dirk Dougherty [Sat, 9 Feb 2013 00:30:26 +0000 (16:30 -0800)]
am
1f7c3cb3: am
061c758c: am
9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '
1f7c3cb3c2b475903c7616bf3f5b06530420cd94':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
Dirk Dougherty [Sat, 9 Feb 2013 00:27:11 +0000 (16:27 -0800)]
am
061c758c: am
9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
061c758cfa5409035854804efa1e0c4d32d2f007':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
Dirk Dougherty [Sat, 9 Feb 2013 00:22:04 +0000 (16:22 -0800)]
am
9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
# Via Dirk Dougherty
* commit '
9fdf671d7f8fb96c1a8d3b41aaf4478e7274e45f':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
Dirk Dougherty [Fri, 8 Feb 2013 23:45:45 +0000 (15:45 -0800)]
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
Change-Id: Ib75e776d0220a86a08ddd5d7e09edd069af05da1
The Android Open Source Project [Fri, 8 Feb 2013 23:40:29 +0000 (15:40 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I242df2bfe9436a6b16e952da318b67b212e54516
The Android Automerger [Fri, 8 Feb 2013 21:51:43 +0000 (13:51 -0800)]
JDQ39
The Android Automerger [Fri, 8 Feb 2013 21:50:51 +0000 (13:50 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Fri, 8 Feb 2013 01:07:57 +0000 (17:07 -0800)]
am
cd7ef9ce: am
8359d2c4: am
b7f96375: docs: fix ::selection style to use Android blue for text highlighting
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
cd7ef9ce90907f6894679bf293c7fca4759c3e72':
docs: fix ::selection style to use Android blue for text highlighting
Scott Main [Fri, 8 Feb 2013 01:05:25 +0000 (17:05 -0800)]
am
8359d2c4: am
b7f96375: docs: fix ::selection style to use Android blue for text highlighting
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
8359d2c4e98df00f66712c79efe3216059f5424d':
docs: fix ::selection style to use Android blue for text highlighting
Scott Main [Fri, 8 Feb 2013 01:00:42 +0000 (17:00 -0800)]
am
b7f96375: docs: fix ::selection style to use Android blue for text highlighting
# Via Scott Main
* commit '
b7f963758f1a252a943b67b200b8e6141d94430c':
docs: fix ::selection style to use Android blue for text highlighting
Scott Main [Fri, 8 Feb 2013 00:56:43 +0000 (16:56 -0800)]
docs: fix ::selection style to use Android blue for text highlighting
Change-Id: I485be948326fc40c349c8170dd1be13962b4c003
Raghu Gandham [Fri, 8 Feb 2013 00:07:01 +0000 (16:07 -0800)]
For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option
So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.
Change-Id: I48fd6f2b0cbe80c3cd90f453ced97a2f154f7ad3
Signed-off-by: Rocky Zhang <yan@mips.com>
The Android Automerger [Thu, 7 Feb 2013 22:23:55 +0000 (14:23 -0800)]
JDQ38
The Android Automerger [Thu, 7 Feb 2013 22:23:13 +0000 (14:23 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Open Source Project [Wed, 6 Feb 2013 17:11:09 +0000 (09:11 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Icd2030678228e137e2616e2d64847abf4f5a2242
The Android Automerger [Wed, 6 Feb 2013 00:48:44 +0000 (16:48 -0800)]
JDQ36B
The Android Open Source Project [Tue, 5 Feb 2013 21:43:19 +0000 (13:43 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I8c2fd056e6eea6c8d818aa44ced9421f84f64fe5
The Android Automerger [Tue, 5 Feb 2013 20:24:50 +0000 (12:24 -0800)]
JDQ36
The Android Automerger [Tue, 5 Feb 2013 20:24:05 +0000 (12:24 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Mon, 4 Feb 2013 17:07:47 +0000 (09:07 -0800)]
am
97c89d4c: am
7257c71f: am
6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
97c89d4c5de1bae9d2bbfb040a3ca484d4782540':
docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Scott Main [Mon, 4 Feb 2013 17:07:46 +0000 (09:07 -0800)]
am
9bbc247d: am
a334cee6: am
77c51357: docs: fix lang switcher for gae by deleting obsolete method call
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
9bbc247decb20ac35fded7d56afb6e424ca56173':
docs: fix lang switcher for gae by deleting obsolete method call
Scott Main [Mon, 4 Feb 2013 17:07:31 +0000 (09:07 -0800)]
am
2baf87e4: am
b88c1a8a: am
98f23e7a: docs: delete obsolete asset files
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
2baf87e4f34659905cdea30100855fbdf041d02a':
docs: delete obsolete asset files
Scott Main [Mon, 4 Feb 2013 17:07:30 +0000 (09:07 -0800)]
am
20ba728e: am
89442344: am
e05e6f99: docs: update template files with those from the templates-ds directory
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
20ba728ecbff1019939c3486a146581d1c158b4e':
docs: update template files with those from the templates-ds directory
Scott Main [Mon, 4 Feb 2013 17:07:29 +0000 (09:07 -0800)]
am
086e7f8b: am
79935f59: am
015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
086e7f8b23f3f5547d75078a670dd4efeede6bc8':
docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
Dirk Dougherty [Mon, 4 Feb 2013 17:07:28 +0000 (09:07 -0800)]
am
34eb13de: am
18a1a50f: am
9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '
34eb13de682225fbb6453f606ed75b3460c0a57d':
Add new droiddoc option for project-specific secondary html input/output paths.
Dirk Dougherty [Mon, 4 Feb 2013 17:07:27 +0000 (09:07 -0800)]
am
5bd7d418: am
9c3033ce: am
dc6b4a59: Add templates for devsite docs builds.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '
5bd7d418aa88ab914576f8cbf3a5fcd6bf7b45eb':
Add templates for devsite docs builds.
The Android Automerger [Sat, 2 Feb 2013 04:45:42 +0000 (20:45 -0800)]
JDQ32B
The Android Automerger [Sat, 2 Feb 2013 02:25:58 +0000 (18:25 -0800)]
JDQ32
The Android Automerger [Sat, 2 Feb 2013 02:24:59 +0000 (18:24 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Fri, 1 Feb 2013 23:41:22 +0000 (15:41 -0800)]
am
7257c71f: am
6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
7257c71fa86f6d65fab9fae4b9fd76c2f6ba3b70':
docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Scott Main [Fri, 1 Feb 2013 23:41:21 +0000 (15:41 -0800)]
am
a334cee6: am
77c51357: docs: fix lang switcher for gae by deleting obsolete method call
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
a334cee69d787ca3fb22a790f002443c02804176':
docs: fix lang switcher for gae by deleting obsolete method call
Scott Main [Fri, 1 Feb 2013 23:34:17 +0000 (15:34 -0800)]
am
6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
6668404ede38d806102eb481d857ca8c0931d364':
docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Scott Main [Fri, 1 Feb 2013 23:34:17 +0000 (15:34 -0800)]
am
77c51357: docs: fix lang switcher for gae by deleting obsolete method call
# Via Scott Main
* commit '
77c51357eb1ba3b55d0a9363cb981daab1b484d2':
docs: fix lang switcher for gae by deleting obsolete method call
Scott Main [Fri, 1 Feb 2013 23:31:56 +0000 (23:31 +0000)]
Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
Scott Main [Fri, 1 Feb 2013 23:29:44 +0000 (15:29 -0800)]
docs: minimize code-font line-height.
Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Change-Id: I0f39655472d09f5af346c7c7e4df8eb0a5a144df
Scott Main [Fri, 1 Feb 2013 22:29:44 +0000 (14:29 -0800)]
am
b88c1a8a: am
98f23e7a: docs: delete obsolete asset files
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
b88c1a8a053a2274b315bc83c5f7e1c4d5666f68':
docs: delete obsolete asset files
Scott Main [Fri, 1 Feb 2013 22:29:43 +0000 (14:29 -0800)]
am
89442344: am
e05e6f99: docs: update template files with those from the templates-ds directory
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
894423441edeb5ff431c1c82db8fa42ab25a27f7':
docs: update template files with those from the templates-ds directory
Scott Main [Fri, 1 Feb 2013 22:29:42 +0000 (14:29 -0800)]
am
79935f59: am
015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
79935f593bc567517c95d0f09198a519f315b2ca':
docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
Dirk Dougherty [Fri, 1 Feb 2013 22:29:41 +0000 (14:29 -0800)]
am
18a1a50f: am
9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
18a1a50f981449bb3dbd6bab3ee2502b51259fd7':
Add new droiddoc option for project-specific secondary html input/output paths.
Dirk Dougherty [Fri, 1 Feb 2013 22:29:40 +0000 (14:29 -0800)]
am
9c3033ce: am
dc6b4a59: Add templates for devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
9c3033ce0e099b8722cb8524ee52b6bce2e46506':
Add templates for devsite docs builds.
Scott Main [Fri, 1 Feb 2013 21:28:09 +0000 (13:28 -0800)]
am
98f23e7a: docs: delete obsolete asset files
# Via Scott Main
* commit '
98f23e7af0480b70515552195e359633191f83d8':
docs: delete obsolete asset files
Scott Main [Fri, 1 Feb 2013 21:28:02 +0000 (13:28 -0800)]
am
e05e6f99: docs: update template files with those from the templates-ds directory
# Via Scott Main
* commit '
e05e6f99b312e9a7b460b70986a419d30576d66c':
docs: update template files with those from the templates-ds directory
Scott Main [Fri, 1 Feb 2013 21:27:58 +0000 (13:27 -0800)]
am
015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
# Via Scott Main
* commit '
015d616af8cf72cf609b19257604e520a70c3286':
docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
Dirk Dougherty [Fri, 1 Feb 2013 21:27:53 +0000 (13:27 -0800)]
am
9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Dirk Dougherty
* commit '
9c2336e073cef13a5237965dc7d5fcdb0091be34':
Add new droiddoc option for project-specific secondary html input/output paths.
Dirk Dougherty [Fri, 1 Feb 2013 21:27:40 +0000 (13:27 -0800)]
am
dc6b4a59: Add templates for devsite docs builds.
# Via Dirk Dougherty
* commit '
dc6b4a591c62f72ee5fea1e3bdadd3584e1eb284':
Add templates for devsite docs builds.
The Android Automerger [Thu, 31 Jan 2013 04:06:22 +0000 (20:06 -0800)]
JDQ30
The Android Automerger [Thu, 31 Jan 2013 04:05:38 +0000 (20:05 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Wed, 30 Jan 2013 23:03:59 +0000 (15:03 -0800)]
docs: fix lang switcher for gae by deleting obsolete method call
Change-Id: I8d91d18e89d539960c93748557cccc5aabb0a263
Scott Main [Tue, 29 Jan 2013 23:12:52 +0000 (15:12 -0800)]
docs: delete obsolete asset files
Change-Id: I1aa8a8fa757dbc81180c0585eacb68df5fe0ceb1
Scott Main [Tue, 29 Jan 2013 21:34:17 +0000 (13:34 -0800)]
docs: update template files with those from the templates-ds directory
Change-Id: I47b07b17ea79d0b00300492ba7854e37f1ab00d0
The Android Automerger [Tue, 29 Jan 2013 22:22:27 +0000 (14:22 -0800)]
JDQ29C
The Android Automerger [Tue, 29 Jan 2013 21:52:21 +0000 (13:52 -0800)]
JDQ29B
Elliott Hughes [Tue, 29 Jan 2013 21:49:55 +0000 (13:49 -0800)]
am
6463953e: am
b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
# Via Android Git Automerger (1) and others
* commit '
6463953e169bbd559cada7263be363202ed40d02':
Remove HAVE_DLADDR from AndroidConfig.h.
Elliott Hughes [Tue, 29 Jan 2013 21:47:14 +0000 (13:47 -0800)]
am
b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
b796ce353d114328cc16a1f2ad2b1059b03a0c52':
Remove HAVE_DLADDR from AndroidConfig.h.
Elliott Hughes [Tue, 29 Jan 2013 21:28:58 +0000 (21:28 +0000)]
Merge "Remove HAVE_DLADDR from AndroidConfig.h."
The Android Automerger [Tue, 29 Jan 2013 20:58:19 +0000 (12:58 -0800)]
JDQ29
The Android Automerger [Tue, 29 Jan 2013 20:57:58 +0000 (12:57 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Tue, 29 Jan 2013 17:01:52 +0000 (09:01 -0800)]
docs: use devsite hdf bool as a javascript condition for managing the lang toggle.
sync the sdk and ds templates so we can move toward one template set
Change-Id: I5316d4cd085734a47953beba203ba8beeb64549e
The Android Automerger [Tue, 29 Jan 2013 06:18:25 +0000 (22:18 -0800)]
JDQ28
The Android Automerger [Tue, 29 Jan 2013 06:17:51 +0000 (22:17 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Dirk Dougherty [Tue, 29 Jan 2013 02:57:30 +0000 (18:57 -0800)]
Add new droiddoc option for project-specific secondary html input/output paths.
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
Dirk Dougherty [Mon, 28 Jan 2013 22:49:50 +0000 (14:49 -0800)]
Add templates for devsite docs builds.
Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061
Ying Wang [Mon, 28 Jan 2013 19:36:51 +0000 (11:36 -0800)]
am
cf0a9042: am
9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Android Git Automerger (1) and others
* commit '
cf0a90426ad969bd2deb66b0c23079842b6c4fa2':
Use += to append to target-specific PRIVATE_CLEAN_FILES
Ying Wang [Mon, 28 Jan 2013 19:34:56 +0000 (11:34 -0800)]
am
9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Gerrit Code Review (1) and Ying Wang (1)
* commit '
9e808ff70515479458d39abfd64ed11eb55fefbb':
Use += to append to target-specific PRIVATE_CLEAN_FILES
Ying Wang [Mon, 28 Jan 2013 19:05:29 +0000 (19:05 +0000)]
Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
Ying Wang [Mon, 28 Jan 2013 18:58:01 +0000 (10:58 -0800)]
Use += to append to target-specific PRIVATE_CLEAN_FILES
Instead of incorrectly including global variable PRIVATE_CLEAN_FILES
Change-Id: I9b5e12448dad5001de051a566d8a94a89b20ecac
Elliott Hughes [Fri, 25 Jan 2013 23:57:40 +0000 (15:57 -0800)]
Remove HAVE_DLADDR from AndroidConfig.h.
Change-Id: I014ce98c61b12169e381b769af34b682df46087e
The Android Automerger [Thu, 24 Jan 2013 00:29:19 +0000 (16:29 -0800)]
JDQ23
The Android Automerger [Thu, 24 Jan 2013 00:28:43 +0000 (16:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 18 Jan 2013 20:20:38 +0000 (12:20 -0800)]
JDQ18
The Android Automerger [Fri, 18 Jan 2013 20:19:58 +0000 (12:19 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Ying Wang [Fri, 18 Jan 2013 02:13:08 +0000 (18:13 -0800)]
am
383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
* commit '
383ecfaf023dab1fcab25d97548093e32ef1a564':
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Ying Wang [Tue, 4 Dec 2012 02:24:55 +0000 (18:24 -0800)]
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Cherry picked from commit
fe3f62d06b77888cddf0365a40b20835eeac221f
in master. Since this is already in master, and we're upstream,
set to DO NOT MERGE.
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: Mike J. Chen <mjchen@google.com>
The Android Automerger [Thu, 17 Jan 2013 00:42:11 +0000 (16:42 -0800)]
JDQ16
The Android Automerger [Thu, 17 Jan 2013 00:41:17 +0000 (16:41 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Tue, 15 Jan 2013 05:13:27 +0000 (21:13 -0800)]
am
fb959d01: am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:10:48 +0000 (21:10 -0800)]
am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
474b3f1198223b61f912c29d2e5c069dcfe322e0':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:07:29 +0000 (21:07 -0800)]
am
eb41035f: docs: add the ability to pause the carousel
* commit '
eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 03:03:40 +0000 (19:03 -0800)]
docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
The Android Automerger [Thu, 10 Jan 2013 19:57:20 +0000 (11:57 -0800)]
JDQ10
The Android Automerger [Thu, 10 Jan 2013 19:56:40 +0000 (11:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 9 Jan 2013 23:48:26 +0000 (15:48 -0800)]
JDQ09
The Android Automerger [Wed, 9 Jan 2013 23:47:20 +0000 (15:47 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Wed, 9 Jan 2013 02:59:29 +0000 (18:59 -0800)]
am
468a239d: am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
468a239d0cc522623f1896b3837092f629393292':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:56:40 +0000 (18:56 -0800)]
am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking