OSDN Git Service
Stuart Scott [Thu, 1 Aug 2013 21:31:54 +0000 (14:31 -0700)]
Changing make hierarchy of mini.
bug:
8503391
Change-Id: I22f2048cec7f232010e00109ef82bed271602cb1
Ying Wang [Wed, 31 Jul 2013 23:54:07 +0000 (23:54 +0000)]
Merge "Error and exit if BUILD_MULTI_PREBUILT is incorrectly used"
Ying Wang [Wed, 31 Jul 2013 23:26:01 +0000 (16:26 -0700)]
Error and exit if BUILD_MULTI_PREBUILT is incorrectly used
Bug:
10114476
Change-Id: Id51e7ca443c3742e17cbe114aefbb7ed3870b0e5
Elliott Hughes [Wed, 31 Jul 2013 23:25:26 +0000 (16:25 -0700)]
Remove one last icu.dat.
Change-Id: Iadeae68e49b18d735e7cfc263800c96998efd23b
Elliott Hughes [Wed, 31 Jul 2013 22:49:04 +0000 (15:49 -0700)]
resolved conflicts for merge of
8714c831 to master
Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d
Elliott Hughes [Wed, 31 Jul 2013 22:43:11 +0000 (15:43 -0700)]
am
2266fa92: Merge "Remove the bogus icu.dat dependency."
* commit '
2266fa92a856a81fdfc5e6c5d9b073b2d6173a02':
Remove the bogus icu.dat dependency.
Elliott Hughes [Wed, 31 Jul 2013 22:35:47 +0000 (22:35 +0000)]
Merge "Remove the bogus icu.dat dependency."
Elliott Hughes [Wed, 31 Jul 2013 22:02:17 +0000 (15:02 -0700)]
Remove the bogus icu.dat dependency.
Simply depending on the icu4c libraries now pulls in the appropriate
data files for you.
Change-Id: Ied659584b2583c92d871c5823988ce0a865eabe4
Ying Wang [Wed, 31 Jul 2013 19:18:36 +0000 (12:18 -0700)]
More verbose on what the build system is doing
Sometimes users get confused for long time of no message printed to the
screen.
Change-Id: I99d3b2954f3dcba47d5ee5dd9fd760578c0e0192
Andy McFadden [Wed, 31 Jul 2013 14:29:25 +0000 (14:29 +0000)]
Merge "Add screenrecord"
Scott Main [Wed, 31 Jul 2013 03:18:41 +0000 (20:18 -0700)]
am
bc36e229: am
d1d606b4: am
c774a312: Merge "fix sidebar autoscroll when the selected doc is not visible. bug:
9676913" into jb-mr2-docs
* commit '
bc36e22992e11e9a3856f1c78bb73ee44a748e92':
fix sidebar autoscroll when the selected doc is not visible. bug:
9676913
Scott Main [Wed, 31 Jul 2013 03:18:40 +0000 (20:18 -0700)]
am
65c92265: am
14066e74: am
5eccda8d: add \'wide\' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
* commit '
65c922653bbdd779bc250befe5c78b1b78f8577c':
add 'wide' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
Scott Main [Wed, 31 Jul 2013 03:13:31 +0000 (20:13 -0700)]
am
d1d606b4: am
c774a312: Merge "fix sidebar autoscroll when the selected doc is not visible. bug:
9676913" into jb-mr2-docs
* commit '
d1d606b4d6370ff535c1651eeec659137ad880a6':
fix sidebar autoscroll when the selected doc is not visible. bug:
9676913
Scott Main [Wed, 31 Jul 2013 03:13:30 +0000 (20:13 -0700)]
am
14066e74: am
5eccda8d: add \'wide\' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
* commit '
14066e74c3ce41a49395ef9805d998ceeb52d41a':
add 'wide' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
Scott Main [Wed, 31 Jul 2013 03:09:21 +0000 (20:09 -0700)]
am
c774a312: Merge "fix sidebar autoscroll when the selected doc is not visible. bug:
9676913" into jb-mr2-docs
* commit '
c774a312359ddf3fedcbe90b00ff6d6f330d95b8':
fix sidebar autoscroll when the selected doc is not visible. bug:
9676913
Scott Main [Wed, 31 Jul 2013 03:09:21 +0000 (20:09 -0700)]
am
5eccda8d: add \'wide\' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
* commit '
5eccda8d6b929d607ae73485d5e86576184d057f':
add 'wide' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
Scott Main [Wed, 31 Jul 2013 01:14:33 +0000 (01:14 +0000)]
Merge "fix sidebar autoscroll when the selected doc is not visible. bug:
9676913" into jb-mr2-docs
Scott Main [Wed, 31 Jul 2013 01:00:51 +0000 (18:00 -0700)]
fix sidebar autoscroll when the selected doc is not visible.
bug:
9676913
This was not working for third generation list items. Switching
the position measurement to be relative to the entire page rather than
the parent container fixes it. I then added 125px to account for
the site header and set the threshold and placement of scrolled items
to be at 80% the nav height.
Change-Id: Idda1896d11069e56325ba830ed745dae9e0fc483
Andy McFadden [Wed, 31 Jul 2013 00:17:51 +0000 (17:17 -0700)]
Add screenrecord
Add the "screenrecord" command for all builds of most devices.
Change-Id: Ib4f37cc219a8d2f9a09ac3f457e5f94506a4d88d
Scott Main [Tue, 30 Jul 2013 21:56:45 +0000 (14:56 -0700)]
add 'wide' version of design/develop cross-link buttons.
Primarily for training pages, which have a wider TOC box
Change-Id: I29644596e72e43432f7bd00fd6a5aabf7e3a6bb7
Joe Fernandez [Tue, 30 Jul 2013 21:56:25 +0000 (14:56 -0700)]
am
f4f3db60: (-s ours) am
847e02cb: am
3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
* commit '
f4f3db604fd560e4bcecbdf753ec6f8c9feb8a1a':
DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
Joe Fernandez [Tue, 30 Jul 2013 21:53:07 +0000 (14:53 -0700)]
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
Joe Fernandez [Tue, 30 Jul 2013 21:41:58 +0000 (14:41 -0700)]
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
Jean-Baptiste Queru [Tue, 30 Jul 2013 17:28:17 +0000 (10:28 -0700)]
am
50a402af: am
f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit '
50a402af7ae550c96b9142ab56d3a23a8a8d22b1':
Added generic hook for loading vendor specific defintions
Jean-Baptiste Queru [Tue, 30 Jul 2013 14:33:53 +0000 (07:33 -0700)]
am
f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit '
f1534b6292a609bb5f55c4a617f3cd1054f90a81':
Added generic hook for loading vendor specific defintions
Jean-Baptiste Queru [Tue, 30 Jul 2013 14:26:44 +0000 (14:26 +0000)]
Merge "Added generic hook for loading vendor specific defintions"
Todd Poynor [Thu, 2 May 2013 00:30:01 +0000 (17:30 -0700)]
Add healthd
Change-Id: I055581a12fe88a4e1fb04e675036bf0d345c05c6
Ying Wang [Fri, 26 Jul 2013 20:00:20 +0000 (13:00 -0700)]
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.
Ying Wang [Fri, 26 Jul 2013 19:57:19 +0000 (12:57 -0700)]
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.
Ying Wang [Fri, 26 Jul 2013 19:54:11 +0000 (12:54 -0700)]
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.
Ying Wang [Fri, 26 Jul 2013 19:19:20 +0000 (12:19 -0700)]
Put a copy of the radio/bootloader files in the dist dir.
Bug:
10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
Marie Lennerhagen [Wed, 20 Oct 2010 11:41:59 +0000 (13:41 +0200)]
Added generic hook for loading vendor specific defintions
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
Jonathan Dixon [Fri, 26 Jul 2013 16:49:19 +0000 (16:49 +0000)]
Merge "Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG"
keunyoung [Fri, 26 Jul 2013 01:42:03 +0000 (01:42 +0000)]
Merge "fix build"
keunyoung [Fri, 26 Jul 2013 01:20:09 +0000 (18:20 -0700)]
fix build
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy
bug:
10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
Joe Fernandez [Fri, 26 Jul 2013 00:05:06 +0000 (17:05 -0700)]
DO NOT MERGE
cherrypick from jb-mr2-ub-dev
docs: small fix for NDK download table
Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c
Joe Fernandez [Fri, 26 Jul 2013 00:23:04 +0000 (17:23 -0700)]
am
cb4a1e67: am
8d936902: docs: small fix for NDK download table
* commit '
cb4a1e673eafc52c496dfed294c5431c80c52688':
docs: small fix for NDK download table
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 [Fri, 26 Jul 2013 00:04:24 +0000 (17:04 -0700)]
am
8574e7d9: am
48e3f1d6: Add new table rows for legacy ndk downloads.
* commit '
8574e7d93e28069983da51ef40fa47bdc2e51daa':
Add new table rows for legacy ndk downloads.
Ying Wang [Fri, 26 Jul 2013 00:04:20 +0000 (17:04 -0700)]
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.
Ulas Kirazci [Thu, 25 Jul 2013 23:34:23 +0000 (16:34 -0700)]
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."
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
Jonathan Dixon [Thu, 25 Jul 2013 22:49:52 +0000 (15:49 -0700)]
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
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."
Ying Wang [Thu, 25 Jul 2013 22:09:32 +0000 (22:09 +0000)]
Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH"
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:11:50 +0000 (09:11 -0700)]
am
89599549: (-s ours) am
be581317: Merge "Change build id to OPENMASTER"
* commit '
8959954976b2b92c0b1935569cd963d292cd8e8c':
Change build id to OPENMASTER
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
Ben Murdoch [Thu, 25 Jul 2013 10:44:53 +0000 (11:44 +0100)]
Revert "Allow proto builds to pass in java proto params."
This reverts commit
28b46fc16c026365378909f1cc88fad0d3b2395c.
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.
Ulas Kirazci [Thu, 25 Jul 2013 07:47:09 +0000 (00:47 -0700)]
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.
Ying Wang [Thu, 25 Jul 2013 07:47:08 +0000 (00:47 -0700)]
am
6f9c87ed: am
45339b01: Merge "Use consistent search depth."
* commit '
6f9c87ede60c52a42b107fa5fb06e0f2f654ca9f':
Use consistent search depth.
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:27:49 +0000 (16:27 -0700)]
am
c5b665ad: am
0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit '
c5b665addf7f6a6ca7225b8f75bf419ada2ce74c':
remove renderscript support lib from javadocs
Scott Main [Wed, 24 Jul 2013 23:27:48 +0000 (16:27 -0700)]
am
1a980beb: am
5430d20d: fix the api level filter (wasn\'t greying out APIs on page load)
* commit '
1a980bebd48940688ae078e29f46b174a8c92e99':
fix the api level filter (wasn't greying out APIs on page load)
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)
Ying Wang [Wed, 24 Jul 2013 00:57:38 +0000 (17:57 -0700)]
Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH
- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug:
9990214
Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
Keun-young Park [Wed, 24 Jul 2013 22:06:49 +0000 (22:06 +0000)]
Merge "Fix issue with DEBUG_OUT_DIR not properly selected"
Tom Cherry [Fri, 15 Jun 2012 00:33:38 +0000 (17:33 -0700)]
Fix issue with DEBUG_OUT_DIR not properly selected
- patch from NVDIA
bug:
9968564
Change-Id: I2082f989d75fb168fb42947d723de093beff4ff1
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>
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
Brian Carlstrom [Tue, 23 Jul 2013 21:22:00 +0000 (14:22 -0700)]
Enable runtime_libart on darwin.
Change-Id: I0499bb387af827379fa4bb5e71a9770a89093c53
Scott Main [Tue, 23 Jul 2013 19:51:29 +0000 (12:51 -0700)]
am
d039c5e2: am
701a07fd: remove margin changes for paragraphs in collapse container
* commit '
d039c5e27bdec1898709cb715e4410c885b218d3':
remove margin changes for paragraphs in collapse container
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
Doug Zongker [Tue, 23 Jul 2013 19:10:05 +0000 (19:10 +0000)]
Merge "distinguish signed and unsigned user builds in UI"
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>
Doug Zongker [Tue, 23 Jul 2013 18:51:04 +0000 (11:51 -0700)]
distinguish signed and unsigned user builds in UI
Add "dev-keys" or "test-keys" to the value of ro.build.display.id for
user builds. (This is the property that is displayed under "Build
number" in the Settings UI.) Modify the signing script to remove the
keys tag from this value when signing.
Change-Id: I3d9d92056f8567d7f84b1be047619be7c6e4c419
keunyoung [Mon, 22 Jul 2013 23:46:10 +0000 (23:46 +0000)]
Merge "add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip"
keunyoung [Mon, 22 Jul 2013 21:54:58 +0000 (14:54 -0700)]
add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip
- This can be used to deliver stuffs like kernel symbol file.
- Files are added in relative path from the top of android source tree.
- PDK_PLATFORM_ZIP_PRODUCT_BINARIES will be defined in BoardConfig.mk.
- files under out dir will be rejected to prevent possible conflicts.
bug:
9963432
Change-Id: Id1da643534cd86939df4941f39e4414d343bba99
Michael Runge [Mon, 22 Jul 2013 21:57:00 +0000 (21:57 +0000)]
Merge "Revert "Update OTA to understand SELinux filesystem labels""
Michael Runge [Mon, 22 Jul 2013 20:42:44 +0000 (20:42 +0000)]
Revert "Update OTA to understand SELinux filesystem labels"
This reverts commit
fbbd79530adc6ddd6bbfb3c5fc60ba5ec0ce5f2d.
All incremental auto OTAs broken b/
9964074
Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de
The Android Open Source Project [Mon, 22 Jul 2013 15:01:58 +0000 (08:01 -0700)]
am
90a4ac4c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
90a4ac4c1eafd897800c72fa8c732f97ffa95d28':
"JSS15J"
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:26:47 +0000 (18:26 -0700)]
am
62eda460: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
62eda460c411b21dce28b8ea6a9ee9245d896dd5':
"JSS15I"
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 23:02:26 +0000 (16:02 -0700)]
am
7017cfe1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
7017cfe124721cadd3315a0a5700c83545916673':
"JSS15H"
"JSS15G"
JSS15F
"JSS15E"
"JSS15D"
"JSS15C"
Scott Main [Fri, 19 Jul 2013 22:48:46 +0000 (15:48 -0700)]
am
3497ef57: am
98a2a71f: edit code-caption style margin
* commit '
3497ef575318aafbe06387a474ae6d5152fae82f':
edit code-caption style margin
Ying Wang [Fri, 19 Jul 2013 21:37:25 +0000 (14:37 -0700)]
Add framework2 to the java pdk package.
To fix pdk fusion build.
Change-Id: I5989f38e48614faa742f8362bde841fe084d9c13
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"
Amith Yamasani [Fri, 19 Jul 2013 01:48:32 +0000 (18:48 -0700)]
Clean generated java files since framework intermediates has partially moved.
Change-Id: I89dea945e1c931e26985a6af7bf54ede93d2ee33
Nick Kralevich [Thu, 18 Jul 2013 22:25:58 +0000 (22:25 +0000)]
Merge "Update OTA to understand SELinux filesystem labels"