OSDN Git Service
Kenny Root [Thu, 28 Feb 2013 17:47:35 +0000 (09:47 -0800)]
am
08d56b4a: Merge "CTS: work around ClassLoader limitation"
* commit '
08d56b4a1049fe4b4d3a01e2087f371fdeefaf84':
CTS: work around ClassLoader limitation
Kenny Root [Thu, 28 Feb 2013 17:23:54 +0000 (17:23 +0000)]
Merge "CTS: work around ClassLoader limitation"
Kenny Root [Thu, 28 Feb 2013 00:55:56 +0000 (16:55 -0800)]
CTS: work around ClassLoader limitation
Trying to use reflection on classes loaded from a different ClassLoader
than the system one caused SecurityException since you can't load
certain packages.
Adding them to the boot classpath forces them to be in the same
ClassLoader.
Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
Ian Rogers [Wed, 27 Feb 2013 19:02:42 +0000 (11:02 -0800)]
am
c148cca6: Merge "Specify -msse3 on host as on target."
* commit '
c148cca6611c167115458453c250dd9e81b03dda':
Specify -msse3 on host as on target.
Ian Rogers [Wed, 27 Feb 2013 18:15:49 +0000 (18:15 +0000)]
Merge "Specify -msse3 on host as on target."
Scott Main [Wed, 27 Feb 2013 02:18:34 +0000 (18:18 -0800)]
am
d9876348: am
6fc990df: am
c5998412: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
d9876348e1533dbb04779fa4b0b5ccd1b46747fa':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
Scott Main [Wed, 27 Feb 2013 02:16:09 +0000 (18:16 -0800)]
am
6fc990df: am
c5998412: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
6fc990dfe16fb6336457ef0e02a9befd8525082b':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
Scott Main [Wed, 27 Feb 2013 02:14:14 +0000 (18:14 -0800)]
am
c5998412: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
c5998412fda760deacd5a408759f52820735effe':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
Scott Main [Wed, 27 Feb 2013 02:12:22 +0000 (18:12 -0800)]
am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
f8333457a5ee9abd3d16c9c0abfe0e19e032801f':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
Scott Main [Wed, 27 Feb 2013 02:10:20 +0000 (18:10 -0800)]
Revert "docs: move loading of google ref into doc load event to prevent error during load"
This reverts commit
578d6446eb1714e17a5ccf55a69379f064ec549a.
Ian Rogers [Tue, 26 Feb 2013 23:10:22 +0000 (15:10 -0800)]
Specify -msse3 on host as on target.
Make the host and the target x86 build more uniform by using the same machine flags.
Its unlikely Android has ever been built on a machine without SSE3 support.
Bug:
8068608
Change-Id: I19635528b61bf2c6faf02c2e575b1d9bf8025d3a
Scott Main [Tue, 26 Feb 2013 22:56:00 +0000 (14:56 -0800)]
am
0670acc9: am
690dc39c: am
79d08b2c: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
0670acc9c38b498c2d1f3abb44304d81d42308ca':
docs: move loading of google ref into doc load event to prevent error during load
Scott Main [Tue, 26 Feb 2013 22:54:30 +0000 (14:54 -0800)]
am
690dc39c: am
79d08b2c: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
690dc39c46604194a4f189841566e8313125e745':
docs: move loading of google ref into doc load event to prevent error during load
Scott Main [Tue, 26 Feb 2013 22:53:26 +0000 (14:53 -0800)]
am
79d08b2c: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
79d08b2cc185c0141ee7ec534b219242c827387f':
docs: move loading of google ref into doc load event to prevent error during load
Scott Main [Tue, 26 Feb 2013 22:51:06 +0000 (14:51 -0800)]
am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
578d6446eb1714e17a5ccf55a69379f064ec549a':
docs: move loading of google ref into doc load event to prevent error during load
Scott Main [Tue, 26 Feb 2013 22:46:12 +0000 (14:46 -0800)]
docs: move loading of google ref into doc load event to prevent error during load
Change-Id: Ibe825c25e19f136b2cd58e8a096d13904720e3d2
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:30:41 +0000 (14:30 -0800)]
am
8a0dc8e1: am
ee98d0ed: (-s ours) am
53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
* commit '
8a0dc8e13891678151d8e314a0259666835fed43':
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:29:17 +0000 (14:29 -0800)]
am
ee98d0ed: (-s ours) am
53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
* commit '
ee98d0ed53aeffac2b1d1be2b24bb78f282af0b2':
Drop official SDK 17
JOP40G
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:28:07 +0000 (14:28 -0800)]
am
53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
* commit '
53ed93f3c47c454f14d1218e4b1b2cfab5308e43':
Drop official SDK 17
JOP40G
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:20:43 +0000 (14:20 -0800)]
Merge from jb-mr1-dev - do not merge
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:02:57 +0000 (14:02 -0800)]
Reconcile with jb-mr1-release - do not merge
Scott Main [Tue, 26 Feb 2013 21:16:22 +0000 (13:16 -0800)]
am
fb247b7e: am
386cbaeb: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
fb247b7e5c1067038518e52aa62a1cbb54ac6fde':
docs: fix suggestions due to file name change for js files
Scott Main [Tue, 26 Feb 2013 21:13:44 +0000 (13:13 -0800)]
am
386cbaeb: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
386cbaeb90fef0ea90695fac8faa407fbffa356a':
docs: fix suggestions due to file name change for js files
Scott Main [Tue, 26 Feb 2013 21:10:04 +0000 (13:10 -0800)]
am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
9f2971d1f36e0bffd79033e946ff1378e6ceb309':
docs: fix suggestions due to file name change for js files
Scott Main [Tue, 26 Feb 2013 21:07:41 +0000 (13:07 -0800)]
docs: fix suggestions due to file name change for js files
Change-Id: I4037c80f79f37f7a80d0977b4e07f992e3de61e1
Scott Main [Tue, 26 Feb 2013 19:27:37 +0000 (11:27 -0800)]
am
2e639566: am
8429876f: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
2e639566471841811ad29cd13a1f029d15b0dd85':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
Scott Main [Tue, 26 Feb 2013 19:25:22 +0000 (11:25 -0800)]
am
8429876f: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
8429876f53cbe617ea36d80a97454146f4b4b746':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
Scott Main [Tue, 26 Feb 2013 19:21:21 +0000 (11:21 -0800)]
am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
7e447edffa935a3c94978304521099b9ac43b53d':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
Scott Main [Wed, 20 Feb 2013 01:22:37 +0000 (17:22 -0800)]
docs: update search suggest with google services apis
including some optimizations for loading javascript resources
Change-Id: Idfea12bbb70a24a7853d997e8376e3db50e56760
Ying Wang [Tue, 26 Feb 2013 01:49:28 +0000 (17:49 -0800)]
am
93cdbd0b: Merge "Run zipalign after classes.dex is removed from the apk"
* commit '
93cdbd0b81e96649ebb789710429388c054bc377':
Run zipalign after classes.dex is removed from the apk
Ying Wang [Tue, 26 Feb 2013 00:51:10 +0000 (00:51 +0000)]
Merge "Run zipalign after classes.dex is removed from the apk"
Ying Wang [Tue, 26 Feb 2013 00:02:42 +0000 (16:02 -0800)]
Run zipalign after classes.dex is removed from the apk
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
Jean-Baptiste Queru [Mon, 25 Feb 2013 21:18:26 +0000 (13:18 -0800)]
am
0426da29: Merge "Fixed error message for using OpenJDK."
* commit '
0426da292cc7cf4b7889e6105c8ef8aa9cee4ce3':
Fixed error message for using OpenJDK.
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>
Ken Sumrall [Sat, 23 Feb 2013 08:55:23 +0000 (00:55 -0800)]
am
3a588682: am
8d27d6d3: am
44281a1f: Add unified fstab support to release tools
* commit '
3a58868258aea60d17abe7e4169a3a64bf1a0d21':
Add unified fstab support to release tools
Ken Sumrall [Sat, 23 Feb 2013 08:53:10 +0000 (00:53 -0800)]
am
8d27d6d3: am
44281a1f: Add unified fstab support to release tools
* commit '
8d27d6d378fffba4c4254ccad6a1872692839a8c':
Add unified fstab support to release tools
Ken Sumrall [Sat, 23 Feb 2013 08:49:39 +0000 (00:49 -0800)]
am
44281a1f: Add unified fstab support to release tools
* commit '
44281a1f3ec99d650595b01b34185e1ffb129c6f':
Add unified fstab support to release tools
Nick Kralevich [Sat, 23 Feb 2013 02:28:13 +0000 (18:28 -0800)]
am
33b190f6: Merge "build: update fs_config calls for capabilities change."
* commit '
33b190f6c6653b3c3493c725a96ff340c4466604':
build: update fs_config calls for capabilities change.
Nick Kralevich [Sat, 23 Feb 2013 02:04:55 +0000 (02:04 +0000)]
Merge "build: update fs_config calls for capabilities change."
Ken Sumrall [Wed, 20 Feb 2013 01:35:29 +0000 (17:35 -0800)]
Add unified fstab support to release tools
Update the release tools to be able to handle the new unified fstab.
Change-Id: Id9d1810c89aba415e83ae2fc586520f148ec73ef
The Android Open Source Project [Fri, 22 Feb 2013 21:39:36 +0000 (13:39 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I652e19ace85b7b2be9c723b5ce1e7f36f7ae963f
Ying Wang [Fri, 22 Feb 2013 18:50:21 +0000 (10:50 -0800)]
am
b303d5d7: Merge "[MIPS] Update build rules"
* commit '
b303d5d7d461e7f9eca3fc058c6eed69bfed4094':
[MIPS] Update build rules
Ying Wang [Fri, 22 Feb 2013 18:50:21 +0000 (10:50 -0800)]
am
4703b491: Merge "We shouldn\'t use temporary variable in the build recipe."
* commit '
4703b491d73938f7861b874a5212b2214a74e988':
We shouldn't use temporary variable in the build recipe.
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
Scott Main [Thu, 21 Feb 2013 22:33:06 +0000 (14:33 -0800)]
am
10bbe830: am
121a4a3e: am
d6cb8fac: docs: fix padding for left-figure class
* commit '
10bbe8309767a82ddc2d114856722b0f51bcbf87':
docs: fix padding for left-figure class
Scott Main [Thu, 21 Feb 2013 22:33:06 +0000 (14:33 -0800)]
am
4edc153f: am
245a4f64: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
4edc153fe6e44495deaf07e720bccc97d8e3fd07':
docs: add image frame style and left-float figure box
Robert Ly [Thu, 21 Feb 2013 22:33:05 +0000 (14:33 -0800)]
am
c6ff854b: am
eb8edf43: am
dae7b523: Revert "support differently named lists.js files"
* commit '
c6ff854bbf0b436dc3467801cd5aa595a5064c5a':
Revert "support differently named lists.js files"
Scott Main [Thu, 21 Feb 2013 22:28:56 +0000 (14:28 -0800)]
am
121a4a3e: am
d6cb8fac: docs: fix padding for left-figure class
* commit '
121a4a3e29c7f76264ea450ee750e68084669556':
docs: fix padding for left-figure class
Scott Main [Thu, 21 Feb 2013 22:28:56 +0000 (14:28 -0800)]
am
245a4f64: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
245a4f644c79f584ac205240069c15d5afd77d8b':
docs: add image frame style and left-float figure box
Robert Ly [Thu, 21 Feb 2013 22:28:55 +0000 (14:28 -0800)]
am
eb8edf43: am
dae7b523: Revert "support differently named lists.js files"
* commit '
eb8edf43a12c4ef1f9ad6667c33960d9a3a52db0':
Revert "support differently named lists.js files"
Scott Main [Thu, 21 Feb 2013 22:18:09 +0000 (14:18 -0800)]
am
d6cb8fac: docs: fix padding for left-figure class
* commit '
d6cb8fac5397ff6cc114705ad789e29dca9ea1ec':
docs: fix padding for left-figure class
Scott Main [Thu, 21 Feb 2013 22:18:08 +0000 (14:18 -0800)]
am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
0e69c3e4e752eb309babe198ebe939e015918401':
docs: add image frame style and left-float figure box
Robert Ly [Thu, 21 Feb 2013 22:18:07 +0000 (14:18 -0800)]
am
dae7b523: Revert "support differently named lists.js files"
* commit '
dae7b523aa1f2b26c42cfb2810a1b8f788ae4301':
Revert "support differently named lists.js files"
Scott Main [Thu, 21 Feb 2013 21:05:03 +0000 (13:05 -0800)]
docs: fix padding for left-figure class
Change-Id: Ic4a1a95410f4d913a278bdb8a75c98ce5c4f5bfd
Scott Main [Thu, 21 Feb 2013 18:53:25 +0000 (18:53 +0000)]
Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
Scott Main [Thu, 21 Feb 2013 18:52:02 +0000 (10:52 -0800)]
docs: add image frame style and left-float figure box
Change-Id: I9103f6f9e9b416902fbb2add60782ba10ff9e900
Robert Ly [Thu, 21 Feb 2013 02:07:00 +0000 (02:07 +0000)]
Revert "support differently named lists.js files"
This reverts commit
a6043f76fa41d6062f3ba9e0aae06feb562f8b51
Change-Id: Id7212f9f1ffbe62fd26f97ab6dcea93bcb34e476
Robert Ly [Wed, 20 Feb 2013 23:24:45 +0000 (15:24 -0800)]
am
b6bd8e5b: am
2b878f60: am
a6043f76: support differently named lists.js files
* commit '
b6bd8e5be9a746f376c521cf5a78bbf875624b4d':
support differently named lists.js files
Robert Ly [Wed, 20 Feb 2013 23:22:22 +0000 (15:22 -0800)]
am
2b878f60: am
a6043f76: support differently named lists.js files
* commit '
2b878f60c9e668b8a31d58ac8c89307b5b4faa45':
support differently named lists.js files
Robert Ly [Wed, 20 Feb 2013 23:17:49 +0000 (15:17 -0800)]
am
a6043f76: support differently named lists.js files
* commit '
a6043f76fa41d6062f3ba9e0aae06feb562f8b51':
support differently named lists.js files
Robert Ly [Wed, 20 Feb 2013 22:47:44 +0000 (14:47 -0800)]
support differently named lists.js files
Change-Id: Id564c916e891051f73e4c7d7a3683d58a48ee16d
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>
Scott Kennedy [Wed, 20 Feb 2013 00:23:26 +0000 (16:23 -0800)]
am
d7cfdd87: am
ad1862c1: Include Email in emulator system image
* commit '
d7cfdd87b7150a84e62022952c4f884bc32f1517':
Include Email in emulator system image
Scott Kennedy [Wed, 20 Feb 2013 00:21:35 +0000 (16:21 -0800)]
am
ad1862c1: Include Email in emulator system image
* commit '
ad1862c1876936bfe125bf1faad0a92e9675e9f2':
Include Email in emulator system image
Scott Kennedy [Tue, 19 Feb 2013 23:18:49 +0000 (15:18 -0800)]
Include Email in emulator system image
Bug:
8226275
Change-Id: Id7083e06fc1d146b56308d42dc16aad9087f09ad
Ying Wang [Fri, 15 Feb 2013 23:52:07 +0000 (15:52 -0800)]
am
cdacb378: Merge "[MIPS] Use mksh for /system/bin/sh"
* commit '
cdacb3780667bc8d51032d1fb9388ce10bebb9c3':
[MIPS] Use mksh for /system/bin/sh
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 20:27:30 +0000 (12:27 -0800)]
am
5e12e60b: 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."
* commit '
5e12e60b472fbd2e712ee9ba04637e3d26b18b71':
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.
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 01:29:19 +0000 (17:29 -0800)]
am
f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
f6b670b702c3f9ba307ddd0751d471116d9d1a90':
Remove more always-true ARCH_ARM_HAVE_ flags.
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 01:09:18 +0000 (17:09 -0800)]
am
07a58f8f: Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
07a58f8fef9ba3ce7454771049522e3fd75f4f6c':
Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
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
Scott Main [Wed, 13 Feb 2013 19:52:47 +0000 (11:52 -0800)]
am
3824401b: am
76fa47d6: am
769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
3824401b18090d10d923341dc127d2adb9e20aa2':
docs: re-add dev-docs css because it's needed by diff reports
Scott Main [Wed, 13 Feb 2013 19:50:36 +0000 (11:50 -0800)]
am
76fa47d6: am
769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
76fa47d606f084676908aeeb4ffbc44f17398e43':
docs: re-add dev-docs css because it's needed by diff reports
Scott Main [Wed, 13 Feb 2013 19:47:02 +0000 (11:47 -0800)]
am
769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports
# Via Scott Main
* commit '
769a5d86987ef54d4b6f11b592100abadbf71756':
docs: re-add dev-docs css because it's needed by diff reports
Scott Main [Wed, 13 Feb 2013 19:39:09 +0000 (11:39 -0800)]
docs: re-add dev-docs css because it's needed by diff reports
Change-Id: Ic3f334f5510b008cd1f744823e46fb4fdf5630bd
Scott Main [Tue, 12 Feb 2013 22:48:01 +0000 (14:48 -0800)]
am
d48506da: am
40e30da7: am
ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite template migration
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
d48506da27c04393185f1b419832657dd63446ac':
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
Scott Main [Tue, 12 Feb 2013 22:46:10 +0000 (14:46 -0800)]
am
40e30da7: am
ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite template migration
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
40e30da78a7551b91674cc41ac134146b85daa22':
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
Scott Main [Tue, 12 Feb 2013 22:42:20 +0000 (14:42 -0800)]
am
ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite template migration
# Via Scott Main
* commit '
ac2aef5bd880213ead6ad5b467dc0838dd836a5e':
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
Scott Main [Tue, 12 Feb 2013 22:15:23 +0000 (14:15 -0800)]
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
Change-Id: I5785c63603d8da5dfa1118fe28a3106aa20835a6
Scott Main [Mon, 11 Feb 2013 20:02:33 +0000 (12:02 -0800)]
am
8234b23a: am
33925453: am
3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
8234b23a96d5cbcb04af7a498ec2b119dad69abf':
docs: udpate JS bundle URL for dac devsite
Scott Main [Mon, 11 Feb 2013 20:00:21 +0000 (12:00 -0800)]
am
33925453: am
3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
339254537d99c0fef145fc60add9d5b94a0e651a':
docs: udpate JS bundle URL for dac devsite
Scott Main [Mon, 11 Feb 2013 19:56:25 +0000 (11:56 -0800)]
am
3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
3062cb889b9722922d310ddfbe3d736cb8dff49d':
docs: udpate JS bundle URL for dac devsite
Scott Main [Mon, 11 Feb 2013 19:54:11 +0000 (19:54 +0000)]
Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
Scott Main [Mon, 11 Feb 2013 19:42:14 +0000 (11:42 -0800)]
docs: udpate JS bundle URL for dac devsite
Change-Id: I06d8b8536c55581b8e7b2d59c55b3d3069d7fe1d
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