Dirk Dougherty
db93202436
Merge "Doc change: css for n5 device video frame." into klp-dev
2013-10-27 00:04:01 +00:00
Dirk Dougherty
d5d3f805e0
Doc change: css for n5 device video frame.
...
Change-Id: I283c5c7cb3bb84c494b493b333e47f69b2595501
2013-10-26 12:17:44 -07:00
Colin Cross
a2ccae2546
Merge "avoid // in copy headers rule" into klp-dev
2013-10-24 01:23:34 +00:00
Colin Cross
a6c4ebdd11
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
2013-10-23 13:18:39 -07:00
Baligh Uddin
a7b5c4a7dc
Waiting till post MR0 - this impacts signing tools for MR0.
...
Revert "Modify release tools to replace certs in MMAC files."
This reverts commit a6e0466ab5
2013-10-23 16:53:43 +00:00
Robert Craig
a6e0466ab5
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 817c574d75
2013-10-22 13:54:46 -07:00
Alex Medina
0068d25b48
Include drawables for all densities - b/11270325
...
Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5
2013-10-18 13:42:42 -07:00
Jeff Sharkey
53619434ed
Merge "Add blkid to all builds for use by vold." into klp-dev
2013-10-17 16:33:38 +00:00
Ed Heyl
3b6bffcda4
merge in klp-release (no-op)
2013-10-16 17:34:58 -07:00
Scott Main
2b205a5814
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
2013-10-16 17:17:37 -07:00
Scott Main
919edbe776
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
2013-10-16 17:15:00 -07:00
Scott Main
1c09450950
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
2013-10-16 17:10:55 -07:00
Scott Main
6c030b7361
fix javadoc sidenav so it does not cutoff overflowing link names
...
Change-Id: I48f3a7cf4715061702c0a0c7537fa1b09734c62a
2013-10-16 17:04:37 -07:00
Jeff Sharkey
1eb5eb1743
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
2013-10-16 16:31:57 -07:00
The Android Automerger
12db6c634f
"KRT15D"
2013-10-16 01:32:29 -07:00
The Android Automerger
6a22660a5b
merge in klp-release history after reset to klp-dev
2013-10-16 01:31:32 -07:00
The Android Automerger
1c05d9c9b0
"KRT15C"
2013-10-15 21:15:05 -07:00
The Android Automerger
86dab9571e
merge in klp-release history after reset to klp-dev
2013-10-15 21:13:52 -07:00
The Android Automerger
7ae1d52f26
"KRT15B"
2013-10-15 15:57:09 -07:00
The Android Automerger
b97af74d21
merge in klp-release history after reset to klp-dev
2013-10-15 15:55:16 -07:00
Ed Heyl
866db61fff
update dev build ID
...
Change-Id: Icb95a91c7d7ed6754438b5d6bd188cdb3f85a005
2013-10-15 10:37:53 -07:00
The Android Automerger
e483bf6488
"KRT15"
2013-10-15 06:02:48 -07:00
The Android Automerger
7b64caa43d
merge in klp-release history after reset to klp-dev
2013-10-15 06:00:21 -07:00
The Android Automerger
73a4ebe8b2
"KRT14B"
2013-10-14 15:08:31 -07:00
Scott Main
a3362a7f67
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
2013-10-14 13:17:46 -07:00
Scott Main
d19a1ff4b2
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
2013-10-14 13:14:22 -07:00
Scott Main
3f4fcef583
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
2013-10-14 13:11:12 -07:00
Scott Main
25c89dda9f
enable auto-linking to next lesson with 'next-page-link' css class
...
Change-Id: I9f4068a4b0921eee28eee3258b72e5f3ad48a64d
2013-10-14 13:07:55 -07:00
The Android Automerger
222601da40
"KRT14"
2013-10-14 06:01:12 -07:00
The Android Automerger
7e51751f0b
merge in klp-release history after reset to klp-dev
2013-10-14 06:00:07 -07:00
The Android Automerger
d6396ec8d2
"KRT13B"
2013-10-13 19:21:10 -07:00
The Android Automerger
65771e0a63
merge in klp-release history after reset to klp-dev
2013-10-13 19:19:48 -07:00
The Android Automerger
a59c838674
"KRT13"
2013-10-13 06:04:12 -07:00
The Android Automerger
7b7b524323
merge in klp-release history after reset to klp-dev
2013-10-13 06:01:15 -07:00
The Android Automerger
a24b5133b0
"KRT10F"
2013-10-11 12:42:28 -07:00
The Android Automerger
464d6d9207
"KRT10E"
2013-10-11 10:35:47 -07:00
The Android Automerger
14c0858ef6
"KRT10D"
2013-10-10 22:13:46 -07:00
The Android Automerger
e21cf8a5c1
"KRT10C"
2013-10-10 16:27:26 -07:00
The Android Automerger
8e5c9870cc
"KRT10B"
2013-10-10 12:17:09 -07:00
The Android Automerger
6df833d9bf
"KRT10"
2013-10-10 06:02:56 -07:00
The Android Automerger
671f10390d
merge in klp-release history after reset to klp-dev
2013-10-10 06:00:28 -07:00
The Android Automerger
216cb7a2a1
KRT09B
2013-10-09 14:31:23 -07:00
The Android Automerger
a2afff4e53
"KRT09"
2013-10-09 06:03:26 -07:00
The Android Automerger
86de770fa8
merge in klp-release history after reset to klp-dev
2013-10-09 06:00:32 -07:00
The Android Automerger
35a424dc52
"KRT08C"
2013-10-08 16:20:36 -07:00
Ed Heyl
b0ac42546f
merge in KFS78N (no-op)
2013-10-08 15:56:09 -07:00
Ed Heyl
774e017e6f
merge in KQS81M
2013-10-08 15:35:32 -07:00
Jamie Gennis
e652af1e80
Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
2013-10-08 22:08:54 +00:00
The Android Automerger
af95a462b7
"KRT08B"
2013-10-08 14:20:33 -07:00
Dianne Hackborn
56b109da49
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
2013-10-08 14:20:18 -07:00
