The Android Open Source Project
545c8eed67
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa
2013-03-26 10:53:09 -07:00
Scott Main
964c6321ae
am 709fcf04
: am 2325250e
: am 9ae6d37a
: am de295276
: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
...
* commit '709fcf04a0294544658166a10021978870d756ef':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:17:42 -07:00
Scott Main
709fcf04a0
am 2325250e
: am 9ae6d37a
: am de295276
: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
...
* commit '2325250e639f3c443a8ccd006f0d591eb8f1c5d3':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:15:12 -07:00
Scott Main
2325250e63
am 9ae6d37a
: am de295276
: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
...
* commit '9ae6d37ad09cad5eb3e0caa2f0b4c0a507a243f2':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:13:29 -07:00
Scott Main
9ae6d37ad0
am de295276
: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
...
* commit 'de2952768478e6390bcec424bb102911e7f4cbff':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:11:44 -07:00
Scott Main
de29527684
add javascript action events to search suggestions and search results.
...
Allows us to track and compare the success of suggested results and results from Google
Change-Id: I64750e3b96ea585de415969cad8ab46c3bbbcaf4
2013-03-25 15:54:05 -07:00
Ying Wang
ca983c08fb
am 97c280ec
: Merge "We have to use := instead of +="
...
* commit '97c280eced879fb79d32bd527412ab34840dba5c':
We have to use := instead of +=
2013-03-22 19:47:43 -07:00
Ying Wang
97c280eced
Merge "We have to use := instead of +="
2013-03-23 01:56:36 +00:00
Ying Wang
4d063410a3
We have to use := instead of +=
...
If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.
Change-Id: I1635ee4791473f407866e010d612948c02cdebf6
2013-03-22 18:52:57 -07:00
Scott Main
159de1de00
am 1b8b0cfe
: am 79088780
: am 8d92d9ef
: am 01a2545b
: docs: update templates to remove global content for devsite builds
...
* commit '1b8b0cfee98c8d2779dc740707b547846734053f':
docs: update templates to remove global content for devsite builds
2013-03-21 18:33:53 -07:00
Scott Main
1b8b0cfee9
am 79088780
: am 8d92d9ef
: am 01a2545b
: docs: update templates to remove global content for devsite builds
...
* commit '7908878061144b25b1e0baf36619db7b32d07c98':
docs: update templates to remove global content for devsite builds
2013-03-21 18:31:59 -07:00
Scott Main
7908878061
am 8d92d9ef
: am 01a2545b
: docs: update templates to remove global content for devsite builds
...
* commit '8d92d9ef824f265979e68da927f01aba4bb6b314':
docs: update templates to remove global content for devsite builds
2013-03-21 18:29:44 -07:00
Scott Main
8d92d9ef82
am 01a2545b
: docs: update templates to remove global content for devsite builds
...
* commit '01a2545bbab916e45eedbd3708f526ed8bd62935':
docs: update templates to remove global content for devsite builds
2013-03-21 18:27:16 -07:00
Scott Main
01a2545bba
docs: update templates to remove global content for devsite builds
...
Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c
2013-03-21 18:12:51 -07:00
Scott Main
04f2797309
am 8c052d39
: am 82fb80eb
: am ec48ff2b
: am ec93c111
: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
...
* commit '8c052d395db4643303e03efbc35eca0259cee19e':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:25:10 -07:00
Scott Main
8c052d395d
am 82fb80eb
: am ec48ff2b
: am ec93c111
: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
...
* commit '82fb80eb11188592f34056e8c787a74a28be6543':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:23:08 -07:00
Scott Main
82fb80eb11
am ec48ff2b
: am ec93c111
: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
...
* commit 'ec48ff2bed11b0cbdc2686eed28a6edc75425fca':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:20:42 -07:00
Scott Main
ec48ff2bed
am ec93c111
: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
...
* commit 'ec93c11194f55fb2bd9ae23fa502d701bfb09664':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:18:08 -07:00
Scott Main
ec93c11194
Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
2013-03-20 22:16:27 +00:00
Scott Main
a2303454fd
add 64-bit variety NDK packages to download table.
...
Use same naming convention as SDK packages for consistency.
Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c
2013-03-20 15:01:35 -07:00
The Android Automerger
b225d8b17e
JDQ39E
2013-03-20 12:24:22 -07:00
Scott Main
22b048e106
am 86372f1c
: am 7524d02e
: am 4264799b
: am 24790db1
: fix indentation style for nested lists
...
* commit '86372f1c0156b096288274ab85128ffbe9f6f8b4':
fix indentation style for nested lists
2013-03-19 14:48:02 -07:00
Scott Main
86372f1c01
am 7524d02e
: am 4264799b
: am 24790db1
: fix indentation style for nested lists
...
* commit '7524d02ef25fed9241e507ebda53d73a643134e5':
fix indentation style for nested lists
2013-03-19 14:46:48 -07:00
Scott Main
7524d02ef2
am 4264799b
: am 24790db1
: fix indentation style for nested lists
...
* commit '4264799b51dd24fdc154a1ae1b70bc4e0bf7e4a9':
fix indentation style for nested lists
2013-03-19 14:44:53 -07:00
Scott Main
4264799b51
am 24790db1
: fix indentation style for nested lists
...
* commit '24790db1cd7b84c6c36350b232538e519790f799':
fix indentation style for nested lists
2013-03-19 14:43:04 -07:00
Scott Main
24790db1cd
fix indentation style for nested lists
...
Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453
2013-03-19 14:38:59 -07:00
Andrew Hsieh
e874f3ab7c
am 55c06f75
: Merge "Duplicate libgcc.a in front of *so"
...
* commit '55c06f75951c0d31560f90822cd4e5073055855c':
Duplicate libgcc.a in front of *so
2013-03-19 11:15:49 -07:00
Andrew Hsieh
55c06f7595
Merge "Duplicate libgcc.a in front of *so"
2013-03-19 17:59:51 +00:00
Andrew Hsieh
8725b941b0
Duplicate libgcc.a in front of *so
...
Also see 6c7bc550ad
Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
2013-03-19 07:51:52 -07:00
Ben Cheng
870af85234
am e0314245
: Merge "Link libgcc.a before shared libraries (especially libc.so)."
...
* commit 'e03142454b52d9960a93b04f75c1a9487720a73a':
Link libgcc.a before shared libraries (especially libc.so).
2013-03-18 15:21:07 -07:00
Ben Cheng
e03142454b
Merge "Link libgcc.a before shared libraries (especially libc.so)."
2013-03-18 21:05:23 +00:00
Ben Cheng
6c7bc550ad
Link libgcc.a before shared libraries (especially libc.so).
...
[cherry-picked from internal master]
Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
2013-03-18 14:00:44 -07:00
Raphael Moll
a3aea5b6eb
am 0ec2f3df
: Merge "Build SDK using prebuilts/devtools."
...
* commit '0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3':
Build SDK using prebuilts/devtools.
2013-03-14 11:44:07 -07:00
Raphael Moll
0ec2f3df4b
Merge "Build SDK using prebuilts/devtools."
2013-03-14 18:31:36 +00:00
The Android Automerger
a910a319de
JDQ39D
2013-03-14 09:09:42 -07:00
Raphael Moll
8a2b7707dd
Build SDK using prebuilts/devtools.
...
Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
any more but in the sdk/product.mk instead (which they were.)
Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
2013-03-13 15:30:35 -07:00
The Android Automerger
25fd33abe4
JDQ39C
2013-03-12 11:24:51 -07:00
Scott Main
e9d67dccb0
am 56662610
: am 5fef291f
: am 3aca7544
: am 2d967c6d
: tweak jspane width property to ensure bg color for highlighted item is full width
...
* commit '5666261023e8b5362f848ccfd307d52c6b1f2150':
tweak jspane width property to ensure bg color for highlighted item is full width
2013-03-11 13:51:18 -07:00
Scott Main
5666261023
am 5fef291f
: am 3aca7544
: am 2d967c6d
: tweak jspane width property to ensure bg color for highlighted item is full width
...
* commit '5fef291f3e9fa5139d0876a960e0173ef77842da':
tweak jspane width property to ensure bg color for highlighted item is full width
2013-03-11 13:49:53 -07:00
Scott Main
5fef291f3e
am 3aca7544
: am 2d967c6d
: tweak jspane width property to ensure bg color for highlighted item is full width
...
* commit '3aca7544a51296777a91fa6e3ef203cebf14d04c':
tweak jspane width property to ensure bg color for highlighted item is full width
2013-03-11 13:48:34 -07:00
Scott Main
3aca7544a5
am 2d967c6d
: tweak jspane width property to ensure bg color for highlighted item is full width
...
* commit '2d967c6df63c625659dbca486a4ba0a20c1f3561':
tweak jspane width property to ensure bg color for highlighted item is full width
2013-03-11 13:47:13 -07:00
Ying Wang
4f499fba73
am c36f41fd
: Merge "Support gdb wrappers"
...
* commit 'c36f41fd38c0dfc09ef486e6c3b2eda26c3a5b24':
Support gdb wrappers
2013-03-11 09:24:06 -07:00
Scott Main
2d967c6df6
tweak jspane width property to ensure bg color for highlighted item is full width
...
Change-Id: I92e66493229476c29cf71c74091f36063638def4
2013-03-11 09:21:07 -07:00
Ying Wang
c36f41fd38
Merge "Support gdb wrappers"
2013-03-11 16:08:23 +00:00
John Michelau
502002526f
Support gdb wrappers
...
Use gdbwrapper() for launching gdb. This can be redefined to launch
one of the many gdb wrappers instead.
Example:
function gdbwrapper()
{
ddd --debugger $ANDROID_TOOLCHAIN/$GDB -x "$@"
}
Change-Id: I3cce8a2ca1bae6d531e2388a93cb52075b21a42c
2013-03-08 14:12:32 -06:00
Kenny Root
ae9dc40d9e
am eda13282
: Merge changes I1998a9d6,I2513f0de
...
* commit 'eda132820bede79a109c16aa0c91bd6cb15380d8':
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
2013-03-08 11:44:03 -08:00
Kenny Root
eda132820b
Merge changes I1998a9d6,I2513f0de
...
* changes:
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
2013-03-08 19:23:00 +00:00
Jeff Sharkey
301bbadb12
Function to grep AndroidManifest.xml files.
...
(cherry picked from commit 50b61e9e66
)
Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
2013-03-08 10:56:45 -08:00
Jeff Sharkey
cfe0969ab9
Utility to dump stacks from arbitrary processes.
...
Saves any existing traces, dumps stacks from the target process,
then restores the original traces.
(cherry picked from commit f582437162
)
Change-Id: I2513f0de0d90cccd56c4949ca7d218e430439c00
2013-03-08 10:55:37 -08:00
Ying Wang
11872e2592
am c47bea9d
: Merge "Remove nonexisting module names."
...
* commit 'c47bea9dd9288bf429afe1434829afd5e8c208a0':
Remove nonexisting module names.
2013-03-07 18:55:30 -08:00