OSDN Git Service
Dirk Dougherty [Tue, 29 Oct 2013 23:35:11 +0000 (23:35 +0000)]
Merge "Adjust samples output pages." into klp-dev
Dirk Dougherty [Tue, 29 Oct 2013 21:33:15 +0000 (14:33 -0700)]
Adjust samples output pages.
Change-Id: I78a523f218f8733d4a3428e1d54c3c5c471cfa17
Scott Main [Tue, 29 Oct 2013 18:11:19 +0000 (11:11 -0700)]
fix 'next' links to disable them when at the end of a list.
Also remove the "next class" link at the end of training.
Change-Id: I1d81919a0498d57b451741a7a0c12f011921f2cb
Dirk Dougherty [Sun, 27 Oct 2013 00:04:00 +0000 (00:04 +0000)]
Merge "Doc change: css for n5 device video frame." into klp-dev
Dirk Dougherty [Sat, 26 Oct 2013 19:14:47 +0000 (12:14 -0700)]
Doc change: css for n5 device video frame.
Change-Id: I283c5c7cb3bb84c494b493b333e47f69b2595501
Colin Cross [Thu, 24 Oct 2013 01:23:34 +0000 (01:23 +0000)]
Merge "avoid // in copy headers rule" into klp-dev
Colin Cross [Tue, 22 Oct 2013 19:24:21 +0000 (12:24 -0700)]
avoid // in copy headers rule
If LOCAL_COPY_HEADERS_TO is not set, then the copy headers rule
target is set to out/target/product/../obj/include//header.h.
If another rule depends on the header without the //, it will
fail. Don't insert LOCAL_COPY_HEADERS_TO if it is blank.
Change-Id: Ideac7f8e01288ab5cca98645b307945d6ae9e97c
Baligh Uddin [Wed, 23 Oct 2013 16:53:43 +0000 (16:53 +0000)]
Waiting till post MR0 - this impacts signing tools for MR0.
Revert "Modify release tools to replace certs in MMAC files."
This reverts commit
a6e0466ab5771ab1b9f806b9411015b5ff9852f6.
Change-Id: Ib7819185bad119013f307ce4301d5f02190e14ed
Robert Craig [Fri, 19 Apr 2013 14:59:22 +0000 (10:59 -0400)]
Modify release tools to replace certs in MMAC files.
Added support to perform a string replace of specified
dev keys with release keys when using the release tool
scripts.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
(cherry picked from commit
817c574d753191c52acd5787da02bb853d4ac090)
Change-Id: I51be8d62945436d3f374f51867295c5b792d4b53
Bug:
11334314
Alex Medina [Fri, 18 Oct 2013 20:42:42 +0000 (13:42 -0700)]
Include drawables for all densities - b/
11270325
Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5
Jeff Sharkey [Thu, 17 Oct 2013 16:33:38 +0000 (16:33 +0000)]
Merge "Add blkid to all builds for use by vold." into klp-dev
Ed Heyl [Thu, 17 Oct 2013 00:34:58 +0000 (17:34 -0700)]
merge in klp-release (no-op)
Scott Main [Thu, 17 Oct 2013 00:17:37 +0000 (17:17 -0700)]
am
919edbe7: am
1c094509: am
6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '
919edbe7761767c1ed3e3bb3715aa495908601c7':
fix javadoc sidenav so it does not cutoff overflowing link names
Scott Main [Thu, 17 Oct 2013 00:15:00 +0000 (17:15 -0700)]
am
1c094509: am
6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '
1c094509501d970011dfb73f5d1407c944797773':
fix javadoc sidenav so it does not cutoff overflowing link names
Scott Main [Thu, 17 Oct 2013 00:10:55 +0000 (17:10 -0700)]
am
6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '
6c030b7361630951b49ec6fab25973079517076b':
fix javadoc sidenav so it does not cutoff overflowing link names
Scott Main [Thu, 17 Oct 2013 00:04:37 +0000 (17:04 -0700)]
fix javadoc sidenav so it does not cutoff overflowing link names
Change-Id: I48f3a7cf4715061702c0a0c7537fa1b09734c62a
Jeff Sharkey [Wed, 16 Oct 2013 22:42:51 +0000 (15:42 -0700)]
Add blkid to all builds for use by vold.
vold now uses blkid to extract UUID and label information from
inserted physical devices.
Bug:
11175082
Change-Id: I56ebe733ff85a498f6d3cbdcf21d40ddc6123f82
The Android Automerger [Wed, 16 Oct 2013 08:32:29 +0000 (01:32 -0700)]
"KRT15D"
The Android Automerger [Wed, 16 Oct 2013 08:31:32 +0000 (01:31 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 16 Oct 2013 04:15:05 +0000 (21:15 -0700)]
"KRT15C"
The Android Automerger [Wed, 16 Oct 2013 04:13:52 +0000 (21:13 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 22:57:09 +0000 (15:57 -0700)]
"KRT15B"
The Android Automerger [Tue, 15 Oct 2013 22:55:16 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev
Ed Heyl [Tue, 15 Oct 2013 17:37:53 +0000 (10:37 -0700)]
update dev build ID
Change-Id: Icb95a91c7d7ed6754438b5d6bd188cdb3f85a005
The Android Automerger [Tue, 15 Oct 2013 13:02:48 +0000 (06:02 -0700)]
"KRT15"
The Android Automerger [Tue, 15 Oct 2013 13:00:21 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 14 Oct 2013 22:08:31 +0000 (15:08 -0700)]
"KRT14B"
Scott Main [Mon, 14 Oct 2013 20:17:46 +0000 (13:17 -0700)]
am
d19a1ff4: am
3f4fcef5: am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
d19a1ff4b2c4a3c7d76ea94702776e8b2087d705':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Mon, 14 Oct 2013 20:14:22 +0000 (13:14 -0700)]
am
3f4fcef5: am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
3f4fcef5830095ecd7360ee82c59ab6c41b5c826':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Mon, 14 Oct 2013 20:11:12 +0000 (13:11 -0700)]
am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
25c89dda9f416466f28f2fb2341d272ace709199':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Mon, 7 Oct 2013 21:17:55 +0000 (14:17 -0700)]
enable auto-linking to next lesson with 'next-page-link' css class
Change-Id: I9f4068a4b0921eee28eee3258b72e5f3ad48a64d
The Android Automerger [Mon, 14 Oct 2013 13:01:12 +0000 (06:01 -0700)]
"KRT14"
The Android Automerger [Mon, 14 Oct 2013 13:00:07 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 14 Oct 2013 02:21:10 +0000 (19:21 -0700)]
"KRT13B"
The Android Automerger [Mon, 14 Oct 2013 02:19:48 +0000 (19:19 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:04:12 +0000 (06:04 -0700)]
"KRT13"
The Android Automerger [Sun, 13 Oct 2013 13:01:15 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Fri, 11 Oct 2013 19:42:28 +0000 (12:42 -0700)]
"KRT10F"
The Android Automerger [Fri, 11 Oct 2013 17:35:47 +0000 (10:35 -0700)]
"KRT10E"
The Android Automerger [Fri, 11 Oct 2013 05:13:46 +0000 (22:13 -0700)]
"KRT10D"
The Android Automerger [Thu, 10 Oct 2013 23:27:26 +0000 (16:27 -0700)]
"KRT10C"
The Android Automerger [Thu, 10 Oct 2013 19:17:09 +0000 (12:17 -0700)]
"KRT10B"
The Android Automerger [Thu, 10 Oct 2013 13:02:56 +0000 (06:02 -0700)]
"KRT10"
The Android Automerger [Thu, 10 Oct 2013 13:00:28 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 9 Oct 2013 21:31:23 +0000 (14:31 -0700)]
KRT09B
The Android Automerger [Wed, 9 Oct 2013 13:03:26 +0000 (06:03 -0700)]
"KRT09"
The Android Automerger [Wed, 9 Oct 2013 13:00:32 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 8 Oct 2013 23:20:36 +0000 (16:20 -0700)]
"KRT08C"
Ed Heyl [Tue, 8 Oct 2013 22:56:09 +0000 (15:56 -0700)]
merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:35:32 +0000 (15:35 -0700)]
merge in KQS81M
Jamie Gennis [Tue, 8 Oct 2013 22:08:54 +0000 (22:08 +0000)]
Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
The Android Automerger [Tue, 8 Oct 2013 21:20:33 +0000 (14:20 -0700)]
"KRT08B"
Dianne Hackborn [Thu, 3 Oct 2013 18:41:08 +0000 (11:41 -0700)]
So long Key Lime Pie, it was nice knowing you.
Now we are KitKat.
I mean Android 4.4 API 19.
Or whatever.
Bug:
10348975
Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
The Android Automerger [Tue, 8 Oct 2013 13:02:29 +0000 (06:02 -0700)]
"KRT08"
The Android Automerger [Tue, 8 Oct 2013 13:00:18 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Jamie Gennis [Sun, 6 Oct 2013 23:02:02 +0000 (16:02 -0700)]
BoardConfig: Add and document vsync phase offset setting
Bug:
10624956
Change-Id: I82def5730f9d09396809d4b8cd2ea44829b21f22
The Android Automerger [Mon, 7 Oct 2013 23:33:42 +0000 (16:33 -0700)]
"KRT07B"
The Android Automerger [Mon, 7 Oct 2013 17:47:43 +0000 (10:47 -0700)]
KQS81M
The Android Automerger [Mon, 7 Oct 2013 13:01:22 +0000 (06:01 -0700)]
"KRT07"
The Android Automerger [Mon, 7 Oct 2013 13:00:11 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 6 Oct 2013 13:03:38 +0000 (06:03 -0700)]
"KRT06"
The Android Automerger [Sun, 6 Oct 2013 13:00:49 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sat, 5 Oct 2013 01:23:52 +0000 (18:23 -0700)]
"KRT03H"
The Android Automerger [Fri, 4 Oct 2013 23:19:52 +0000 (16:19 -0700)]
"KRT03G"
The Android Automerger [Fri, 4 Oct 2013 20:25:00 +0000 (13:25 -0700)]
"KRT03F"
The Android Automerger [Fri, 4 Oct 2013 19:51:23 +0000 (12:51 -0700)]
"KQS81L"
The Android Automerger [Fri, 4 Oct 2013 17:35:52 +0000 (10:35 -0700)]
"KRT03E"
The Android Automerger [Fri, 4 Oct 2013 02:01:35 +0000 (19:01 -0700)]
"KRT03D"
The Android Automerger [Thu, 3 Oct 2013 22:18:43 +0000 (15:18 -0700)]
"KRT03C"
The Android Automerger [Thu, 3 Oct 2013 20:37:28 +0000 (13:37 -0700)]
"KRT03B"
Dianne Hackborn [Thu, 3 Oct 2013 18:41:08 +0000 (11:41 -0700)]
So long Key Lime Pie, it was nice knowing you.
Now we are KitKat.
I mean Android 4.4 API 19.
Or whatever.
Bug:
10348975
Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
The Android Automerger [Thu, 3 Oct 2013 13:04:43 +0000 (06:04 -0700)]
"KRT03"
The Android Automerger [Thu, 3 Oct 2013 13:01:24 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 3 Oct 2013 01:42:40 +0000 (18:42 -0700)]
"KQS81K"
Colin Cross [Thu, 3 Oct 2013 00:47:50 +0000 (00:47 +0000)]
Merge "don't check paths of non-installed or host modules" into klp-dev
The Android Automerger [Wed, 2 Oct 2013 23:35:12 +0000 (16:35 -0700)]
"KQS81J"
Justin Koh [Wed, 2 Oct 2013 23:13:17 +0000 (23:13 +0000)]
Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
Colin Cross [Wed, 2 Oct 2013 22:16:35 +0000 (15:16 -0700)]
don't check paths of non-installed or host modules
Static libraries and host modules are not installed under
TARGET_OUT_VENDOR and don't need to be, relax the checks.
Change-Id: Ia8b926d466420a8b6dd418d5e95fdf5ff919e078
The Android Automerger [Wed, 2 Oct 2013 21:44:57 +0000 (14:44 -0700)]
"KRT02B"
Justin Koh [Wed, 2 Oct 2013 21:32:15 +0000 (14:32 -0700)]
Move DownloadProviderUi from core_minimal to core.mk
Move DownloadProviderUi from core_minimal to core.mk. This UI requires
DocumentsUi so it doesn't make sense to ship it on devices which are only
using core_minimal.
Change-Id: Id8a4f2a9835a05e9281596dbd5ca7b8e76062cd4
Chris Wren [Wed, 2 Oct 2013 17:30:27 +0000 (13:30 -0400)]
support protos in host java libraries
Change-Id: Ia4499d439ea23ee4d6707cfb005b7230c0a2374f
Ying Wang [Wed, 2 Oct 2013 18:14:56 +0000 (11:14 -0700)]
am
164a9639: am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
164a963962b7b2816bb92016c6ce0ff52ac93c43':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:13:13 +0000 (11:13 -0700)]
am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
9e8b6c429d9d17d8251ae8aa15c6de2420732431':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:11:13 +0000 (11:11 -0700)]
am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
3d48d9c36b2d2cd696d3ee2656939e77ca5ba950':
Allow to run checkbuild in sdk build.
Ying Wang [Thu, 27 Jun 2013 00:56:08 +0000 (17:56 -0700)]
Allow to run checkbuild in sdk build.
Bug:
9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
(cherry picked from commit
fcec57a1165dc78ca2630c017dd95bddce31e55a)
The Android Automerger [Wed, 2 Oct 2013 13:02:34 +0000 (06:02 -0700)]
"KRT02"
The Android Automerger [Wed, 2 Oct 2013 13:00:41 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Ying Wang [Wed, 2 Oct 2013 01:16:45 +0000 (18:16 -0700)]
Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
only if the module is built against the platform, not the SDK.
Previously it added it if it's doing a platform build.
But we can do an apps_only build inside the platform source tree and
such a build may build modules against the platform.
This fixes the apps build in the platform source tree.
Change-Id: I73e32a8f0e505349790a102321f88e77fba472cd
The Android Automerger [Tue, 1 Oct 2013 22:39:38 +0000 (15:39 -0700)]
"KRT01B"
The Android Automerger [Tue, 1 Oct 2013 16:25:25 +0000 (09:25 -0700)]
"KRT01"
The Android Automerger [Tue, 1 Oct 2013 16:25:06 +0000 (09:25 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 1 Oct 2013 14:47:29 +0000 (07:47 -0700)]
"KRT81"
The Android Automerger [Tue, 1 Oct 2013 14:47:14 +0000 (07:47 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 1 Oct 2013 13:02:39 +0000 (06:02 -0700)]
"KRT01"
The Android Automerger [Tue, 1 Oct 2013 13:00:23 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 1 Oct 2013 04:00:24 +0000 (21:00 -0700)]
"KQS81I"
Ben Gilad [Mon, 30 Sep 2013 23:54:17 +0000 (16:54 -0700)]
Replace a dangling refeence to packages/apps/Phone.
Change-Id: I47b68510d19ccbaa2fc125c2a422fd1e857ec18e
The Android Automerger [Mon, 30 Sep 2013 23:37:26 +0000 (16:37 -0700)]
"KRS92B"
The Android Automerger [Mon, 30 Sep 2013 13:01:11 +0000 (06:01 -0700)]
"KRS92"
The Android Automerger [Mon, 30 Sep 2013 13:00:07 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
OSDN Git Service
