76bbd39a91
am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '22c22cf7e0ae42b6c4fa585341459d9aa3b0c4be':
Drop official SDK 17
JOP40G
2013-02-27 06:26:27 +00:00
68510e2508
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
2013-02-27 06:26:24 +00:00
e892c86ef9
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
2013-02-27 06:26:24 +00:00
8d3e1e5573
am 44281a1f: Add unified fstab support to release tools
...
* commit '44281a1f3ec99d650595b01b34185e1ffb129c6f':
Add unified fstab support to release tools
2013-02-27 06:26:07 +00:00
8ced7e638c
am d6cb8fac: docs: fix padding for left-figure class
...
* commit 'd6cb8fac5397ff6cc114705ad789e29dca9ea1ec':
docs: fix padding for left-figure class
2013-02-27 06:25:53 +00:00
373318caf6
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
2013-02-27 06:25:52 +00:00
cef5be2d83
am dae7b523: Revert "support differently named lists.js files"
...
* commit 'dae7b523aa1f2b26c42cfb2810a1b8f788ae4301':
Revert "support differently named lists.js files"
2013-02-27 06:25:52 +00:00
d7f8c32ecd
am 50882118: 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 '5088211890511a4dff5d068f8481abc9680a1795':
Revert "docs: move loading of google ref into doc load event to prevent error during load"
2013-02-27 02:21:38 +00:00
5088211890
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"
2013-02-26 18:18:34 -08:00
d9876348e1
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"
2013-02-26 18:16:09 -08:00
6fc990dfe1
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"
2013-02-26 18:14:14 -08:00
c5998412fd
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"
2013-02-26 18:12:22 -08:00
f8333457a5
Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
This reverts commit 578d6446eb
2013-02-26 18:10:20 -08:00
35a6b4fb65
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
2013-02-26 15:10:22 -08:00
0d3a1fa14b
am 7a689113: am 0670acc9: am 690dc39c: am 79d08b2c: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
...
* commit '7a68911347f18cbbf890bef7f92b28b2872e8e31':
docs: move loading of google ref into doc load event to prevent error during load
2013-02-26 22:58:34 +00:00
7a68911347
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
2013-02-26 14:56:00 -08:00
0670acc9c3
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
2013-02-26 14:54:30 -08:00
690dc39c46
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
2013-02-26 14:53:26 -08:00
79d08b2cc1
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
2013-02-26 14:51:06 -08:00
578d6446eb
docs: move loading of google ref into doc load event to prevent error during load
...
Change-Id: Ibe825c25e19f136b2cd58e8a096d13904720e3d2
2013-02-26 14:46:12 -08:00
e45c235068
am bf13b892: am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
...
* commit 'bf13b8923b7fad0d37b2dcccf2d4dc6b0d4ffff4':
2013-02-26 22:43:15 +00:00
bf13b8923b
am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
...
* commit '8a0dc8e13891678151d8e314a0259666835fed43':
2013-02-26 14:30:41 -08:00
8a0dc8e138
am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
...
* commit 'ee98d0ed53aeffac2b1d1be2b24bb78f282af0b2':
Drop official SDK 17
JOP40G
2013-02-26 14:29:17 -08:00
ee98d0ed53
am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge
...
* commit '53ed93f3c47c454f14d1218e4b1b2cfab5308e43':
Drop official SDK 17
JOP40G
2013-02-26 14:28:07 -08:00
53ed93f3c4
Merge from jb-mr1-dev - do not merge
2013-02-26 14:20:43 -08:00
22c22cf7e0
Reconcile with jb-mr1-release - do not merge
2013-02-26 14:02:57 -08:00
e3d336f549
am 02f3e81e: am fb247b7e: am 386cbaeb: am 9f2971d1: docs: fix suggestions due to file name change for js files
...
* commit '02f3e81e9ee93848d9805222d79a4a76ea2e898a':
docs: fix suggestions due to file name change for js files
2013-02-26 21:18:52 +00:00
02f3e81e9e
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
2013-02-26 13:16:22 -08:00
fb247b7e5c
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
2013-02-26 13:13:44 -08:00
386cbaeb90
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
2013-02-26 13:10:04 -08:00
9f2971d1f3
docs: fix suggestions due to file name change for js files
...
Change-Id: I4037c80f79f37f7a80d0977b4e07f992e3de61e1
2013-02-26 13:07:41 -08:00
68434ff55f
am 70887ad4: am 2e639566: am 8429876f: am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '70887ad43cb1dcdc3527a91b31e875964191edda':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
2013-02-26 20:40:58 +00:00
70887ad43c
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
2013-02-26 11:27:37 -08:00
2e63956647
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
2013-02-26 11:25:22 -08:00
8429876f53
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
2013-02-26 11:21:21 -08:00
7e447edffa
docs: update search suggest with google services apis
...
including some optimizations for loading javascript resources
Change-Id: Idfea12bbb70a24a7853d997e8376e3db50e56760
2013-02-26 10:53:54 -08:00
b9d22596a8
Merge "Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES" into jb-mr2-dev
2013-02-26 02:13:23 +00:00
6c86a133c7
Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES
...
To disentangle the host/target shared library dependencies.
Change-Id: I3122b370a7c24425861ab6dba91e6d8d84b27249
2013-02-25 18:12:11 -08:00
9c1954c43a
am 31428917: am 93cdbd0b: Merge "Run zipalign after classes.dex is removed from the apk"
...
* commit '31428917bc781bbd802048c574488a9e9437c830':
Run zipalign after classes.dex is removed from the apk
2013-02-26 01:50:53 +00:00
31428917bc
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
2013-02-25 17:49:28 -08:00
f7084ca921
Run zipalign after classes.dex is removed from the apk
...
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:58:05 -08:00
93cdbd0b81
Merge "Run zipalign after classes.dex is removed from the apk"
2013-02-26 00:51:10 +00:00
48b6e18f1f
Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev
2013-02-26 00:19:04 +00:00
370fa673b5
Build rs_compatibility_jni_libs into product-specific dir
...
They can't be shared across products.
Change-Id: I2e2b9126f2e78eb28866978d58cf6eb8c52f3d09
2013-02-25 16:06:42 -08:00
7f7d4d93b8
Run zipalign after classes.dex is removed from the apk
...
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:02:42 -08:00
4dbbd8a37e
am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."
...
* commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6':
Fixed error message for using OpenJDK.
2013-02-25 21:21:03 +00:00
757e212ca2
am 0426da29: Merge "Fixed error message for using OpenJDK."
...
* commit '0426da292cc7cf4b7889e6105c8ef8aa9cee4ce3':
Fixed error message for using OpenJDK.
2013-02-25 13:18:26 -08:00
0426da292c
Merge "Fixed error message for using OpenJDK."
2013-02-25 21:01:49 +00:00
304f5194fd
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>
2013-02-23 20:25:00 +01:00
7ef64e31a9
am 89fbf2e2: am 3a588682: am 8d27d6d3: am 44281a1f: Add unified fstab support to release tools
...
* commit '89fbf2e2acfa5ad94308876abd86a14194fd02c1':
Add unified fstab support to release tools
2013-02-23 00:58:55 -08:00
Jean-Baptiste Queru