OSDN Git Service
Joe Fernandez [Fri, 26 Jul 2013 00:21:19 +0000 (17:21 -0700)]
am
8d936902: docs: small fix for NDK download table
* commit '
8d9369023962fefc0b598283b6850789b26f5249':
docs: small fix for NDK download table
Joe Fernandez [Fri, 26 Jul 2013 00:05:06 +0000 (17:05 -0700)]
docs: small fix for NDK download table
Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c
Dirk Dougherty [Thu, 25 Jul 2013 23:12:55 +0000 (16:12 -0700)]
am
48e3f1d6: Add new table rows for legacy ndk downloads.
* commit '
48e3f1d6e40581bc4379c180b9de6fdd41026eee':
Add new table rows for legacy ndk downloads.
Dirk Dougherty [Thu, 25 Jul 2013 22:26:07 +0000 (15:26 -0700)]
Add new table rows for legacy ndk downloads.
Change-Id: If8ebc459415a22719d351d87a55ddeb4ddb6b3ba
Ying Wang [Thu, 25 Jul 2013 22:36:07 +0000 (15:36 -0700)]
am
5d1db8b4: Merge "Allow proto builds to pass in java proto params."
* commit '
5d1db8b4335d554bfd7e028496f0305b78b0676b':
Allow proto builds to pass in java proto params.
Ying Wang [Thu, 25 Jul 2013 22:32:08 +0000 (22:32 +0000)]
Merge "Allow proto builds to pass in java proto params."
Ulas Kirazci [Thu, 25 Jul 2013 19:28:19 +0000 (12:28 -0700)]
Allow proto builds to pass in java proto params.
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
Ulas Kirazci [Thu, 25 Jul 2013 20:35:27 +0000 (13:35 -0700)]
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."
Ulas Kirazci [Thu, 25 Jul 2013 20:31:44 +0000 (20:31 +0000)]
Merge "Revert "Allow proto builds to pass in java proto params.""
Ulas Kirazci [Thu, 25 Jul 2013 19:35:28 +0000 (19:35 +0000)]
Revert "Allow proto builds to pass in java proto params."
This reverts commit
28b46fc16c026365378909f1cc88fad0d3b2395c.
Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
Jean-Baptiste Queru [Thu, 25 Jul 2013 16:07:19 +0000 (09:07 -0700)]
am
be581317: Merge "Change build id to OPENMASTER"
* commit '
be5813170364c382ca2fbc6500d567065449473e':
Change build id to OPENMASTER
Jean-Baptiste Queru [Thu, 25 Jul 2013 16:01:45 +0000 (16:01 +0000)]
Merge "Change build id to OPENMASTER"
Chirayu Desai [Fri, 16 Nov 2012 11:41:17 +0000 (17:11 +0530)]
Change build id to OPENMASTER
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
Ulas Kirazci [Thu, 25 Jul 2013 07:44:07 +0000 (00:44 -0700)]
am
a825aa13: Merge "Allow proto builds to pass in java proto params."
* commit '
a825aa1329cbf28e23a9f7d96dbbe16f3f7ef9db':
Allow proto builds to pass in java proto params.
Ying Wang [Thu, 25 Jul 2013 07:44:07 +0000 (00:44 -0700)]
am
45339b01: Merge "Use consistent search depth."
* commit '
45339b01d61586aa46c4ca98b37e320879fac050':
Use consistent search depth.
Ulas Kirazci [Thu, 25 Jul 2013 03:04:10 +0000 (03:04 +0000)]
Merge "Allow proto builds to pass in java proto params."
Ying Wang [Thu, 25 Jul 2013 01:54:44 +0000 (01:54 +0000)]
Merge "Use consistent search depth."
Ulas Kirazci [Wed, 24 Jul 2013 21:32:14 +0000 (14:32 -0700)]
Allow proto builds to pass in java proto params.
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.
Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
Scott Main [Wed, 24 Jul 2013 23:20:04 +0000 (16:20 -0700)]
am
0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit '
0ce71df0fccdb10c36823307fad7a71c7cd4d4d4':
remove renderscript support lib from javadocs
Scott Main [Wed, 24 Jul 2013 23:20:02 +0000 (16:20 -0700)]
am
5430d20d: fix the api level filter (wasn\'t greying out APIs on page load)
* commit '
5430d20ddae54212a23325579f8de813f733db9a':
fix the api level filter (wasn't greying out APIs on page load)
Scott Main [Wed, 24 Jul 2013 04:03:20 +0000 (04:03 +0000)]
Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
Scott Main [Wed, 24 Jul 2013 04:00:50 +0000 (21:00 -0700)]
remove renderscript support lib from javadocs
Change-Id: I6b06bdcdae79442dbf471816cd1cf6f90873f1b2
Scott Main [Wed, 24 Jul 2013 03:48:54 +0000 (20:48 -0700)]
fix the api level filter (wasn't greying out APIs on page load)
Change-Id: Iaafe8c0652856eaff6725491f21581969e94f430
Scott Main [Tue, 23 Jul 2013 19:49:03 +0000 (12:49 -0700)]
am
701a07fd: remove margin changes for paragraphs in collapse container
* commit '
701a07fd33a14f63e6baf4d1dfa36fd7035a8259':
remove margin changes for paragraphs in collapse container
Scott Main [Tue, 23 Jul 2013 19:41:25 +0000 (12:41 -0700)]
remove margin changes for paragraphs in collapse container
Change-Id: I5ee51699cb473334e1c3cfb520c8145466eea265
Guilhem IMBERTON [Thu, 4 Oct 2012 12:26:57 +0000 (14:26 +0200)]
Use consistent search depth.
AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while
vendorsetup.sh and BoardConfig.mk only allow for smaller depth.
Make search depth consistent for these files.
Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>
The Android Open Source Project [Mon, 22 Jul 2013 14:59:15 +0000 (07:59 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I6f1b8561853187e3a82f0da2e428188c10e64807
The Android Automerger [Sun, 21 Jul 2013 17:20:19 +0000 (10:20 -0700)]
"JSS15J"
The Android Open Source Project [Sun, 21 Jul 2013 01:25:23 +0000 (18:25 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I68646ef2af902737659f0874fc2bb17612747c3a
The Android Automerger [Sat, 20 Jul 2013 22:27:46 +0000 (15:27 -0700)]
"JSS15I"
The Android Open Source Project [Fri, 19 Jul 2013 21:20:21 +0000 (14:20 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id68bc43f09ff7d7aa7f48ed9cdca06e14aea4c9c
Scott Main [Fri, 19 Jul 2013 20:42:42 +0000 (13:42 -0700)]
am
98a2a71f: edit code-caption style margin
* commit '
98a2a71f9ee7ea7e347c686ce89d4d4a3b0fba5b':
edit code-caption style margin
The Android Automerger [Fri, 19 Jul 2013 10:17:16 +0000 (03:17 -0700)]
"JSS15H"
The Android Automerger [Fri, 19 Jul 2013 03:48:00 +0000 (20:48 -0700)]
"JSS15G"
The Android Automerger [Thu, 18 Jul 2013 20:53:12 +0000 (13:53 -0700)]
JSS15F
The Android Automerger [Thu, 18 Jul 2013 18:25:20 +0000 (11:25 -0700)]
"JSS15E"
Ying Wang [Thu, 18 Jul 2013 17:02:45 +0000 (10:02 -0700)]
am
a1f8cdf7: Merge "Allow several system property files"
* commit '
a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
Allow several system property files
Ying Wang [Thu, 18 Jul 2013 17:00:19 +0000 (17:00 +0000)]
Merge "Allow several system property files"
The Android Automerger [Wed, 17 Jul 2013 21:59:40 +0000 (14:59 -0700)]
"JSS15D"
Scott Main [Wed, 17 Jul 2013 20:15:04 +0000 (13:15 -0700)]
edit code-caption style margin
Change-Id: I63c58015ca9037621c5d4c3929620ebd2203f5ad
The Android Automerger [Tue, 16 Jul 2013 22:26:08 +0000 (15:26 -0700)]
"JSS15C"
The Android Open Source Project [Tue, 16 Jul 2013 18:19:11 +0000 (11:19 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24
Johan Redestig [Thu, 12 Apr 2012 15:00:58 +0000 (17:00 +0200)]
Allow several system property files
TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.
Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
The Android Automerger [Tue, 16 Jul 2013 03:56:09 +0000 (20:56 -0700)]
JSS15B
Scott Main [Mon, 15 Jul 2013 21:21:00 +0000 (14:21 -0700)]
am
d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
* commit '
d67d02274da846184449ac02aba7eafdcba889b1':
fix design/develop boxes float
add style to add nexus 4 frame to screenshots
Scott Main [Mon, 15 Jul 2013 21:15:25 +0000 (21:15 +0000)]
Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
* changes:
fix design/develop boxes float
add style to add nexus 4 frame to screenshots
The Android Open Source Project [Mon, 15 Jul 2013 16:32:27 +0000 (09:32 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2c1659dba0eea86a4a76ee410608febbae466ef2
Ying Wang [Mon, 15 Jul 2013 16:01:59 +0000 (09:01 -0700)]
am
988251c9: Fix error.
* commit '
988251c92269676c891dcb548fecdc100755b431':
Fix $(so_suffix) error.
Ying Wang [Mon, 15 Jul 2013 15:47:33 +0000 (08:47 -0700)]
Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit
80b71fa326e4b5d9510d528c8feb08e28376a350)
The Android Automerger [Mon, 15 Jul 2013 15:19:51 +0000 (08:19 -0700)]
"JSS15"
The Android Automerger [Mon, 15 Jul 2013 15:18:59 +0000 (08:18 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Mon, 15 Jul 2013 14:35:31 +0000 (07:35 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id93477c002befa42eda6aafe3a71323e28ca8ab0
The Android Automerger [Sat, 13 Jul 2013 07:53:18 +0000 (00:53 -0700)]
"JSS11I"
Ying Wang [Sat, 13 Jul 2013 05:34:46 +0000 (22:34 -0700)]
am
ba9636d4: Establish the built module dependencies on prebuilt shared library
* commit '
ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
Establish the built module dependencies on prebuilt shared library
Ying Wang [Sat, 13 Jul 2013 05:05:14 +0000 (22:05 -0700)]
Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit
ada8f296570e0bda93b433a7aa86ad138dd1705e)
Nick Kralevich [Sat, 13 Jul 2013 03:46:51 +0000 (20:46 -0700)]
am
a682f6db: am
4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '
a682f6db7b3e1259ce4abc829bd6763850565494':
emulator: increase system partition to 550M
Nick Kralevich [Sat, 13 Jul 2013 03:44:41 +0000 (20:44 -0700)]
am
4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '
4e132ca5e5c5048d7a95563eddd9f5ef11346678':
emulator: increase system partition to 550M
Nick Kralevich [Sat, 13 Jul 2013 03:42:05 +0000 (03:42 +0000)]
Merge "emulator: increase system partition to 550M"
Nick Kralevich [Sat, 13 Jul 2013 03:28:59 +0000 (20:28 -0700)]
emulator: increase system partition to 550M
Yes, 400M isn't enough. I can't believe it either.
Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
Scott Main [Sat, 13 Jul 2013 02:22:24 +0000 (19:22 -0700)]
fix design/develop boxes float
Change-Id: Id6de3e74667f5cc485290509919e0f5cce689505
The Android Automerger [Sat, 13 Jul 2013 01:49:06 +0000 (18:49 -0700)]
"JSS11H"
The Android Automerger [Sat, 13 Jul 2013 00:10:48 +0000 (17:10 -0700)]
"JSS11G"
Nick Kralevich [Fri, 12 Jul 2013 22:17:20 +0000 (15:17 -0700)]
am
e9ee5e11: am
5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '
e9ee5e11b499f5be72b365585001e310b776d698':
emulator: increase system partition size to 400M
Nick Kralevich [Fri, 12 Jul 2013 22:15:33 +0000 (15:15 -0700)]
am
5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '
5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
emulator: increase system partition size to 400M
Nick Kralevich [Fri, 12 Jul 2013 22:14:02 +0000 (22:14 +0000)]
Merge "emulator: increase system partition size to 400M"
The Android Open Source Project [Fri, 12 Jul 2013 21:52:07 +0000 (14:52 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec
Nick Kralevich [Fri, 12 Jul 2013 20:44:48 +0000 (13:44 -0700)]
emulator: increase system partition size to 400M
300M is too small.
Change-Id: Icbe4e76d6e5c8a50cc6e6d74e324335bc66b8466
The Android Automerger [Fri, 12 Jul 2013 19:19:57 +0000 (12:19 -0700)]
JSS11F
Ying Wang [Fri, 12 Jul 2013 18:12:49 +0000 (11:12 -0700)]
am
6685bd01: am
2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '
6685bd01a953a550f0cebe342e9a1125adffd6b3':
use ext4 instead of yaffs for the emulator
Ying Wang [Fri, 12 Jul 2013 18:11:56 +0000 (11:11 -0700)]
am
2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '
2476ec994d449d31c89571723b4b17826639c1bf':
use ext4 instead of yaffs for the emulator
Ying Wang [Fri, 12 Jul 2013 18:10:13 +0000 (18:10 +0000)]
Merge "use ext4 instead of yaffs for the emulator"
The Android Automerger [Fri, 12 Jul 2013 17:53:23 +0000 (10:53 -0700)]
"JSS11E"
The Android Open Source Project [Fri, 12 Jul 2013 14:27:32 +0000 (07:27 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5f92acba878b1d0f149df1499cc09f3cda23f7e3
Nick Kralevich [Wed, 10 Jul 2013 01:04:51 +0000 (18:04 -0700)]
use ext4 instead of yaffs for the emulator
Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I7c605457b485d169654263caf55eb7d5a9a60c2e
The Android Automerger [Fri, 12 Jul 2013 03:26:53 +0000 (20:26 -0700)]
"JSS11D"
Ying Wang [Fri, 12 Jul 2013 01:56:02 +0000 (18:56 -0700)]
am
a1b948af: am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
a1b948afdb5a46e168cf59ea4045b63722ee8b47':
Include ping6 in all device builds
Ying Wang [Fri, 12 Jul 2013 01:52:19 +0000 (18:52 -0700)]
am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
Include ping6 in all device builds
The Android Automerger [Fri, 12 Jul 2013 01:41:43 +0000 (18:41 -0700)]
JSS11C
The Android Automerger [Fri, 12 Jul 2013 00:12:16 +0000 (17:12 -0700)]
"JSS11B"
Ying Wang [Thu, 11 Jul 2013 19:08:48 +0000 (19:08 +0000)]
Merge "Include ping6 in all device builds"
The Android Open Source Project [Thu, 11 Jul 2013 15:22:27 +0000 (08:22 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448
The Android Automerger [Thu, 11 Jul 2013 12:56:15 +0000 (05:56 -0700)]
"JSS11"
The Android Automerger [Thu, 11 Jul 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Lorenzo Colitti [Thu, 11 Jul 2013 03:54:05 +0000 (12:54 +0900)]
Include ping6 in all device builds
ping6 is currently only included in debug builds. Include it
everywhere, now that it doesn't need to be setuid any more.
Bug:
9469682
Change-Id: Ia78f6b0e5fc8f7042fb99cdb4a0add426bb56c7e
The Android Automerger [Thu, 11 Jul 2013 01:34:56 +0000 (18:34 -0700)]
"JWR66V"
Scott Main [Wed, 10 Jul 2013 23:36:05 +0000 (16:36 -0700)]
add style to add nexus 4 frame to screenshots
Change-Id: I1e96cbd755c4c6f88c807160b9a86b77a5ebed74
The Android Open Source Project [Wed, 10 Jul 2013 15:34:29 +0000 (08:34 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Iab96df1946b1b94645b5e9f99a5bb37178987944
The Android Automerger [Wed, 10 Jul 2013 12:56:05 +0000 (05:56 -0700)]
"JSS10"
The Android Automerger [Wed, 10 Jul 2013 12:55:07 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Wed, 10 Jul 2013 00:13:04 +0000 (17:13 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Iefcd2a29c958299abc4cdfd7217f6f3deb7d483e
Jeff Brown [Tue, 9 Jul 2013 23:48:17 +0000 (16:48 -0700)]
am
a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
* commit '
a3d60ae86f112388c27b4a164f269efd5f6d1c72':
Revert "Remove mediarouter v7 support library from SDK."
Jeff Brown [Tue, 9 Jul 2013 23:44:40 +0000 (23:44 +0000)]
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
The Android Automerger [Tue, 9 Jul 2013 23:38:30 +0000 (16:38 -0700)]
"JSS09B"
The Android Automerger [Tue, 9 Jul 2013 23:27:09 +0000 (16:27 -0700)]
JWR66U
The Android Open Source Project [Tue, 9 Jul 2013 16:36:30 +0000 (09:36 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I9fe682604981ae07715422637fc4629d7e09937f
The Android Automerger [Tue, 9 Jul 2013 12:56:31 +0000 (05:56 -0700)]
"JSS09"
The Android Automerger [Tue, 9 Jul 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Dirk Dougherty [Tue, 9 Jul 2013 00:37:50 +0000 (17:37 -0700)]
am
8c01be68: am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
8c01be686cacb593677dd1a753c132e58aa87661':
Doc change: Move butterbar css to template assets.
Jeff Brown [Tue, 9 Jul 2013 00:35:00 +0000 (00:35 +0000)]
Revert "Remove mediarouter v7 support library from SDK."
This reverts commit
0eacd936b7d6dabd380ecd6f1d25d39625b37495.
Bug:
9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
Dirk Dougherty [Tue, 9 Jul 2013 00:33:58 +0000 (17:33 -0700)]
am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
ccc15faf56ad46f973800cb6bd41b4634b9192a0':
Doc change: Move butterbar css to template assets.
OSDN Git Service
