OSDN Git Service
Dave Langemak [Tue, 3 Dec 2013 23:06:56 +0000 (15:06 -0800)]
.1 becomes .2
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
The Android Automerger [Sat, 14 Dec 2013 02:12:49 +0000 (18:12 -0800)]
KVT49I
The Android Automerger [Fri, 22 Nov 2013 04:29:44 +0000 (20:29 -0800)]
"KOT49E"
The Android Automerger [Thu, 21 Nov 2013 11:33:03 +0000 (03:33 -0800)]
"KOT49D"
The Android Automerger [Wed, 20 Nov 2013 10:58:36 +0000 (02:58 -0800)]
"KOT49C"
The Android Automerger [Wed, 20 Nov 2013 01:36:23 +0000 (17:36 -0800)]
"KOT49B"
The Android Automerger [Mon, 18 Nov 2013 22:49:13 +0000 (14:49 -0800)]
"KOT49"
The Android Automerger [Mon, 18 Nov 2013 22:47:35 +0000 (14:47 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Fri, 15 Nov 2013 23:03:00 +0000 (15:03 -0800)]
"KOT46B"
The Android Automerger [Fri, 15 Nov 2013 23:02:11 +0000 (15:02 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Fri, 15 Nov 2013 14:00:58 +0000 (06:00 -0800)]
"KOT46"
The Android Automerger [Fri, 15 Nov 2013 14:00:29 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Fri, 15 Nov 2013 01:57:09 +0000 (17:57 -0800)]
"KOT45"
The Android Automerger [Fri, 15 Nov 2013 01:55:41 +0000 (17:55 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Dianne Hackborn [Thu, 14 Nov 2013 22:53:54 +0000 (22:53 +0000)]
Merge "Just a little .1 makes all the difference in the world." into klp-dev
Dianne Hackborn [Thu, 14 Nov 2013 20:06:49 +0000 (12:06 -0800)]
Just a little .1 makes all the difference in the world.
Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497
The Android Automerger [Thu, 14 Nov 2013 04:40:14 +0000 (20:40 -0800)]
"KOT44"
Ed Heyl [Wed, 13 Nov 2013 23:19:15 +0000 (15:19 -0800)]
merge in release branch changes (no-op).
The Android Automerger [Wed, 13 Nov 2013 04:00:54 +0000 (20:00 -0800)]
"KOT43B"
The Android Automerger [Wed, 13 Nov 2013 04:00:37 +0000 (20:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 13 Nov 2013 01:25:32 +0000 (17:25 -0800)]
"KOT43"
The Android Automerger [Wed, 13 Nov 2013 01:24:10 +0000 (17:24 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Baligh Uddin [Wed, 13 Nov 2013 00:38:47 +0000 (00:38 +0000)]
Merge "Revert the revert. (its time to sign MR1)" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 00:22:34 +0000 (00:22 +0000)]
Revert the revert. (its time to sign MR1)
Revert "Waiting till post MR0 - this impacts signing tools for MR0."
This reverts commit
a7b5c4a7dc77a0896d6314828b9ce85f82d103e8.
Bug:
11334314
Change-Id: I89f8996161e4258b80bf2d0bc7817f0e8e32df13
The Android Automerger [Mon, 11 Nov 2013 23:50:17 +0000 (15:50 -0800)]
KOT42B
The Android Automerger [Mon, 11 Nov 2013 18:50:43 +0000 (10:50 -0800)]
"KOT42"
The Android Automerger [Mon, 11 Nov 2013 18:50:07 +0000 (10:50 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Sun, 10 Nov 2013 18:04:50 +0000 (10:04 -0800)]
"KOT41B"
The Android Automerger [Sun, 10 Nov 2013 14:01:59 +0000 (06:01 -0800)]
"KOT41"
The Android Automerger [Sun, 10 Nov 2013 14:00:23 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Fri, 8 Nov 2013 21:46:12 +0000 (13:46 -0800)]
"KOT38D"
Ed Heyl [Fri, 8 Nov 2013 21:23:43 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
Jeff Brown [Fri, 8 Nov 2013 01:37:11 +0000 (01:37 +0000)]
Merge "Add a platform library for remote display providers." into klp-dev
The Android Automerger [Fri, 8 Nov 2013 01:04:53 +0000 (17:04 -0800)]
"KOT38C"
The Android Automerger [Thu, 7 Nov 2013 22:40:43 +0000 (14:40 -0800)]
"KOT38B"
Michael Runge [Thu, 7 Nov 2013 01:59:29 +0000 (17:59 -0800)]
Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.
b/
11437930
Change-Id: Ie70632a2fa0a13d4bb259f61c620bb01812494e5
The Android Automerger [Thu, 7 Nov 2013 14:02:30 +0000 (06:02 -0800)]
"KOT38"
The Android Automerger [Thu, 7 Nov 2013 14:00:31 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 6 Nov 2013 23:14:20 +0000 (15:14 -0800)]
"KOT37B"
The Android Automerger [Wed, 6 Nov 2013 14:02:35 +0000 (06:02 -0800)]
"KOT37"
The Android Automerger [Wed, 6 Nov 2013 14:00:25 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Jeff Brown [Wed, 6 Nov 2013 06:17:57 +0000 (22:17 -0800)]
Add a platform library for remote display providers.
Bug:
11257292
Change-Id: Ia0207010c2f3ae143b483e9c1aa6643142740312
The Android Automerger [Tue, 5 Nov 2013 14:05:13 +0000 (06:05 -0800)]
"KOT36"
The Android Automerger [Tue, 5 Nov 2013 14:03:41 +0000 (06:03 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 4 Nov 2013 22:43:58 +0000 (14:43 -0800)]
"KOT35B"
The Android Automerger [Mon, 4 Nov 2013 14:02:25 +0000 (06:02 -0800)]
"KOT35"
The Android Automerger [Mon, 4 Nov 2013 14:00:28 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 4 Nov 2013 01:59:15 +0000 (17:59 -0800)]
KOT31C
The Android Automerger [Fri, 1 Nov 2013 19:58:12 +0000 (12:58 -0700)]
"KOT31B"
The Android Automerger [Fri, 1 Nov 2013 19:57:01 +0000 (12:57 -0700)]
"KOT32"
Scott Main [Thu, 31 Oct 2013 14:20:55 +0000 (07:20 -0700)]
script to handle new static landing pages for sample topics
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
The Android Automerger [Thu, 31 Oct 2013 13:02:23 +0000 (06:02 -0700)]
"KOT31"
The Android Automerger [Thu, 31 Oct 2013 13:00:16 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Scott Main [Wed, 30 Oct 2013 23:27:38 +0000 (16:27 -0700)]
remove the dummy sidenav from samples before populating the real list.
Also make the line numbers hidden before they get moved to avoid
some jankyness during load.
Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
Scott Main [Wed, 30 Oct 2013 21:47:40 +0000 (14:47 -0700)]
make expandable lists under each sample sticky so they don't collapse
when opening other project directories.
change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.
Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
The Android Automerger [Wed, 30 Oct 2013 13:01:53 +0000 (06:01 -0700)]
"KOT30"
The Android Automerger [Wed, 30 Oct 2013 13:00:21 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Dirk Dougherty [Wed, 30 Oct 2013 01:27:10 +0000 (01:27 +0000)]
Merge "Add n5 landscape-13 device video frame and css." into klp-dev
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 23:25:00 +0000 (16:25 -0700)]
Add n5 landscape-13 device video frame and css.
Change-Id: I3b18782680e74bd8d4022e6701bfd61887101cf1
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
The Android Automerger [Tue, 29 Oct 2013 13:02:00 +0000 (06:02 -0700)]
"KOT29"
The Android Automerger [Tue, 29 Oct 2013 13:00:27 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 28 Oct 2013 13:07:58 +0000 (06:07 -0700)]
"KOT28"
The Android Automerger [Mon, 28 Oct 2013 13:02:16 +0000 (06:02 -0700)]
merge in klp-mr1-release history after reset to klp-dev
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
The Android Automerger [Thu, 24 Oct 2013 13:07:11 +0000 (06:07 -0700)]
"KOT24"
The Android Automerger [Thu, 24 Oct 2013 13:00:56 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
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
The Android Automerger [Wed, 23 Oct 2013 13:06:14 +0000 (06:06 -0700)]
"KOT23"
The Android Automerger [Wed, 23 Oct 2013 13:00:52 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
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
The Android Automerger [Tue, 22 Oct 2013 13:02:09 +0000 (06:02 -0700)]
"KOT22"
The Android Automerger [Tue, 22 Oct 2013 13:00:21 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 21 Oct 2013 13:02:31 +0000 (06:02 -0700)]
"KOT21"
The Android Automerger [Mon, 21 Oct 2013 13:00:34 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Alex Medina [Fri, 18 Oct 2013 20:42:42 +0000 (13:42 -0700)]
Include drawables for all densities - b/
11270325
Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5
The Android Automerger [Fri, 18 Oct 2013 13:06:43 +0000 (06:06 -0700)]
"KOT18"
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
OSDN Git Service
