Joe Fernandez
f4f3db604f
am 847e02cb: am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
...
* commit '847e02cbbbe7ecba0b560acc7d5b139798f67ab7':
DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
2013-07-30 14:53:07 -07:00
Joe Fernandez
847e02cbbb
am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
...
* commit '3c1da3e2c966a607bf74bda5151013c5ac324f80':
DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
2013-07-30 14:41:58 -07:00
The Android Automerger
ce9a71ca24
"KRS30C"
2013-07-30 13:19:42 -07:00
The Android Automerger
ec9061ec73
"KRS30B"
2013-07-30 11:12:08 -07:00
The Android Automerger
5bc234fa12
merge in klp-release history after reset to master
2013-07-30 11:08:40 -07:00
Jean-Baptiste Queru
8a7cd65585
am 50a402af: am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
...
* commit '50a402af7ae550c96b9142ab56d3a23a8a8d22b1':
Added generic hook for loading vendor specific defintions
2013-07-30 10:28:17 -07:00
Jean-Baptiste Queru
50a402af7a
am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
...
* commit 'f1534b6292a609bb5f55c4a617f3cd1054f90a81':
Added generic hook for loading vendor specific defintions
2013-07-30 07:33:53 -07:00
Jean-Baptiste Queru
f1534b6292
Merge "Added generic hook for loading vendor specific defintions"
2013-07-30 14:26:45 +00:00
The Android Automerger
ed6e2ab3e4
"KRS25E"
2013-07-29 18:07:43 -07:00
The Android Automerger
4cb036505f
"KRS25D"
2013-07-27 09:51:58 -07:00
keunyoung
9e7289ebab
fix build
...
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy
bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
2013-07-26 15:24:59 -07:00
The Android Automerger
cecf13e52a
"KRS25C"
2013-07-26 15:22:00 -07:00
Todd Poynor
2b3bd4a88b
Add healthd
...
Change-Id: I055581a12fe88a4e1fb04e675036bf0d345c05c6
2013-07-26 21:32:38 +00:00
Ying Wang
54d9cc3fac
am cd9cadbc: am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
...
* commit 'cd9cadbcf68bfe07ac994e61aa00969572ae3fd5':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 13:00:20 -07:00
Ying Wang
cd9cadbcf6
am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
...
* commit '7768c91c1c90e7c13390396d895a3afd5fda3e0f':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:57:19 -07:00
Ying Wang
7768c91c1c
am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
...
* commit '94de1eba0e87297421789b339c5f26bf3e48eeb1':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:54:11 -07:00
Ying Wang
94de1eba0e
Put a copy of the radio/bootloader files in the dist dir.
...
Bug: 10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
2013-07-26 12:19:20 -07:00
Marie Lennerhagen
9e5efceff9
Added generic hook for loading vendor specific defintions
...
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
2013-07-26 18:12:36 +00:00
Jonathan Dixon
8c0d17b6e1
Merge "Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG"
2013-07-26 16:49:19 +00:00
keunyoung
50b9c94777
Merge "fix build"
2013-07-26 01:42:03 +00:00
keunyoung
a219bdc0ba
fix build
...
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy
bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
2013-07-25 18:22:43 -07:00
Joe Fernandez
3c1da3e2c9
DO NOT MERGE
...
cherrypick from jb-mr2-ub-dev
docs: small fix for NDK download table
Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c
2013-07-25 18:21:00 -07:00
Joe Fernandez
1c1eebcbd5
am cb4a1e67: am 8d936902: docs: small fix for NDK download table
...
* commit 'cb4a1e673eafc52c496dfed294c5431c80c52688':
docs: small fix for NDK download table
2013-07-25 17:23:04 -07:00
Joe Fernandez
cb4a1e673e
am 8d936902: docs: small fix for NDK download table
...
* commit '8d9369023962fefc0b598283b6850789b26f5249':
docs: small fix for NDK download table
2013-07-25 17:21:19 -07:00
The Android Automerger
5e9a08a9fc
"KRS25B"
2013-07-25 17:09:39 -07:00
Joe Fernandez
8d93690239
docs: small fix for NDK download table
...
Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c
2013-07-25 17:05:06 -07:00
Dirk Dougherty
45924686eb
am 8574e7d9: am 48e3f1d6: Add new table rows for legacy ndk downloads.
...
* commit '8574e7d93e28069983da51ef40fa47bdc2e51daa':
Add new table rows for legacy ndk downloads.
2013-07-25 17:04:24 -07:00
Ying Wang
5efaa72ac1
am 51aab877: am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
...
* commit '51aab8775ab86990abef411d00f5686e41022eee':
Allow proto builds to pass in java proto params.
2013-07-25 17:04:20 -07:00
Ulas Kirazci
c7fda981ef
am fcbc0b7f: am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""
...
* commit 'fcbc0b7f0b8f654414c97699b36e6356cbb4bb08':
Revert "Allow proto builds to pass in java proto params."
2013-07-25 16:34:23 -07:00
Dirk Dougherty
8574e7d93e
am 48e3f1d6: Add new table rows for legacy ndk downloads.
...
* commit '48e3f1d6e40581bc4379c180b9de6fdd41026eee':
Add new table rows for legacy ndk downloads.
2013-07-25 16:12:55 -07:00
Dirk Dougherty
48e3f1d6e4
Add new table rows for legacy ndk downloads.
...
Change-Id: If8ebc459415a22719d351d87a55ddeb4ddb6b3ba
2013-07-25 15:54:26 -07:00
Jonathan Dixon
d588792d29
Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG
...
WEBCORE_INSTRUMENTATION is never set in practice, nor ever read, so seems
totally spurious.
ENABLE_SVG is the default since 3.0 and disabling will no longer be a
supported option in chromium webview.
Change-Id: I651fa55fd7c20b2f251bae584407548be174a8aa
2013-07-25 15:52:17 -07:00
Ying Wang
51aab8775a
am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
...
* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
Allow proto builds to pass in java proto params.
2013-07-25 15:36:07 -07:00
Ying Wang
5d1db8b433
Merge "Allow proto builds to pass in java proto params."
2013-07-25 22:32:08 +00:00
Ying Wang
7661c1d6f1
Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH"
2013-07-25 22:09:32 +00:00
Ulas Kirazci
6e485b545a
Allow proto builds to pass in java proto params.
...
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
2013-07-25 13:40:53 -07:00
Ulas Kirazci
fcbc0b7f0b
am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""
...
* commit '5094e33bddc5bb7ba8c63b725078764450b16973':
Revert "Allow proto builds to pass in java proto params."
2013-07-25 13:35:27 -07:00
Ulas Kirazci
5094e33bdd
Merge "Revert "Allow proto builds to pass in java proto params.""
2013-07-25 20:31:48 +00:00
Ulas Kirazci
24c7289d24
Revert "Allow proto builds to pass in java proto params."
...
This reverts commit 28b46fc16c
.
Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
2013-07-25 19:35:28 +00:00
Jean-Baptiste Queru
2b0ee3f90d
am 89599549: (-s ours) am be581317: Merge "Change build id to OPENMASTER"
...
* commit '8959954976b2b92c0b1935569cd963d292cd8e8c':
Change build id to OPENMASTER
2013-07-25 09:11:50 -07:00
Jean-Baptiste Queru
8959954976
am be581317: Merge "Change build id to OPENMASTER"
...
* commit 'be5813170364c382ca2fbc6500d567065449473e':
Change build id to OPENMASTER
2013-07-25 09:07:19 -07:00
Jean-Baptiste Queru
be58131703
Merge "Change build id to OPENMASTER"
2013-07-25 16:01:45 +00:00
Chirayu Desai
0564d0ce33
Change build id to OPENMASTER
...
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
2013-07-25 21:26:32 +05:30
The Android Automerger
d42eebbfad
"KRS25"
2013-07-25 06:03:14 -07:00
The Android Automerger
5208565bb6
merge in klp-release history after reset to master
2013-07-25 06:00:27 -07:00
Ben Murdoch
fc2bad5c36
Revert "Allow proto builds to pass in java proto params."
...
This reverts commit 28b46fc16c
.
Speculative fix for master builds. I cannot repro the break the bots
are seeing locally, but it seems related to building protobufs and this
CL was in the first broken build.
2013-07-25 11:44:53 +01:00
Ulas Kirazci
dd3d8f4ca9
am 6a5fc54f: am a825aa13: Merge "Allow proto builds to pass in java proto params."
...
* commit '6a5fc54fe9904214a7df1d34c9d48ad0310d867e':
Allow proto builds to pass in java proto params.
2013-07-25 00:47:09 -07:00
Ying Wang
9352474dae
am 6f9c87ed: am 45339b01: Merge "Use consistent search depth."
...
* commit '6f9c87ede60c52a42b107fa5fb06e0f2f654ca9f':
Use consistent search depth.
2013-07-25 00:47:08 -07:00
Ulas Kirazci
6a5fc54fe9
am a825aa13: Merge "Allow proto builds to pass in java proto params."
...
* commit 'a825aa1329cbf28e23a9f7d96dbbe16f3f7ef9db':
Allow proto builds to pass in java proto params.
2013-07-25 00:44:07 -07:00
Ying Wang
6f9c87ede6
am 45339b01: Merge "Use consistent search depth."
...
* commit '45339b01d61586aa46c4ca98b37e320879fac050':
Use consistent search depth.
2013-07-25 00:44:07 -07:00