OSDN Git Service
Nick Kralevich [Thu, 24 Oct 2013 21:42:26 +0000 (14:42 -0700)]
am
3ee5710d: am
0f798297: am
8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"
* commit '
3ee5710d69c9141ff72de5b67fc33cd7825346f2':
x86: turn on -Wl,--fatal-warnings
Nick Kralevich [Thu, 24 Oct 2013 21:40:00 +0000 (14:40 -0700)]
am
0f798297: am
8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"
* commit '
0f798297636ea07f1a87412776d48a57888ea8fe':
x86: turn on -Wl,--fatal-warnings
Nick Kralevich [Thu, 24 Oct 2013 21:36:38 +0000 (14:36 -0700)]
am
8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"
* commit '
8c4efac588d695b11ed341a0e4531d3e220dbe8c':
x86: turn on -Wl,--fatal-warnings
Nick Kralevich [Thu, 24 Oct 2013 21:34:27 +0000 (21:34 +0000)]
Merge "x86: turn on -Wl,--fatal-warnings"
Nick Kralevich [Thu, 24 Oct 2013 20:32:05 +0000 (13:32 -0700)]
x86: turn on -Wl,--fatal-warnings
In
4f2f16da143fede94a1124ee79efccee78442b90, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation. At the time, we wrote:
=====
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.
This warning will turn into an error in a future change
(via --fatal-warnings)
=====
All code which uses text relocations has either been fixed, or
we've temporarily worked around the issue so the code can still
compile.
Enable --fatal-warnings.
Bug:
11353056
Change-Id: I2f2c65352166ef0a96f54858de1556f0290fe306
Colin Cross [Thu, 24 Oct 2013 18:42:32 +0000 (11:42 -0700)]
am
2df0464a: am
a2ccae25: Merge "avoid // in copy headers rule" into klp-dev
* commit '
2df0464a54c1a4c2fca5814b07ee6d588617f2c4':
avoid // in copy headers rule
Mike Lockwood [Thu, 24 Oct 2013 14:25:56 +0000 (14:25 +0000)]
Merge "Disable recovery in PDK builds"
Baligh Uddin [Thu, 24 Oct 2013 01:32:47 +0000 (18:32 -0700)]
am
31469e36: am
a7b5c4a7: Waiting till post MR0 - this impacts signing tools for MR0.
* commit '
31469e36e078e044e883aeb103888af3411e9691':
Waiting till post MR0 - this impacts signing tools for MR0.
Colin Cross [Thu, 24 Oct 2013 01:30:02 +0000 (18:30 -0700)]
am
a2ccae25: Merge "avoid // in copy headers rule" into klp-dev
* commit '
a2ccae2546db082e571168650b279125bfceb861':
avoid // in copy headers rule
Baligh Uddin [Thu, 24 Oct 2013 01:30:01 +0000 (18:30 -0700)]
am
a7b5c4a7: Waiting till post MR0 - this impacts signing tools for MR0.
* commit '
a7b5c4a7dc77a0896d6314828b9ce85f82d103e8':
Waiting till post MR0 - this impacts signing tools for MR0.
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
Mike Lockwood [Wed, 23 Oct 2013 15:00:42 +0000 (08:00 -0700)]
Disable recovery in PDK builds
Change-Id: Ic6ee44cef37104c8d7facc28dfe45d0ef832ebd0
Robert Craig [Tue, 22 Oct 2013 21:11:26 +0000 (14:11 -0700)]
am
d4086d3b: am
a6e0466a: Modify release tools to replace certs in MMAC files.
* commit '
d4086d3bc0f8c1311373dc3ee0d1da40b269f189':
Modify release tools to replace certs in MMAC files.
Robert Craig [Tue, 22 Oct 2013 21:08:52 +0000 (14:08 -0700)]
am
a6e0466a: Modify release tools to replace certs in MMAC files.
* commit '
a6e0466ab5771ab1b9f806b9411015b5ff9852f6':
Modify release tools to replace certs in MMAC files.
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 [Sat, 19 Oct 2013 01:21:23 +0000 (18:21 -0700)]
am
f9f05814: am
0068d25b: Include drawables for all densities - b/
11270325
* commit '
f9f0581405d09ee6d0d4d9c8350dc3a749606fd6':
Include drawables for all densities - b/
11270325
Alex Medina [Sat, 19 Oct 2013 01:17:47 +0000 (18:17 -0700)]
am
0068d25b: Include drawables for all densities - b/
11270325
* commit '
0068d25b4895162993118fe3b61d2775fa575e70':
Include drawables for all densities - b/
11270325
Alex Medina [Fri, 18 Oct 2013 20:42:42 +0000 (13:42 -0700)]
Include drawables for all densities - b/
11270325
Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5
Ben Cheng [Fri, 18 Oct 2013 19:16:41 +0000 (12:16 -0700)]
am
8f55b16f: am
ad6996a6: am
34cf868b: Merge "Point to the uapi header location for aarch64."
* commit '
8f55b16fb6a506db36cd602343888ce1807e6e72':
Point to the uapi header location for aarch64.
Ben Cheng [Fri, 18 Oct 2013 19:11:34 +0000 (12:11 -0700)]
am
ad6996a6: am
34cf868b: Merge "Point to the uapi header location for aarch64."
* commit '
ad6996a611c0af563edcb352828d3bd55cf85585':
Point to the uapi header location for aarch64.
Ben Cheng [Fri, 18 Oct 2013 19:07:23 +0000 (12:07 -0700)]
am
34cf868b: Merge "Point to the uapi header location for aarch64."
* commit '
34cf868be4c7da1e58324051b968021742727692':
Point to the uapi header location for aarch64.
Ben Cheng [Fri, 18 Oct 2013 16:45:12 +0000 (16:45 +0000)]
Merge "Point to the uapi header location for aarch64."
Brett Chabot [Thu, 17 Oct 2013 17:01:04 +0000 (17:01 +0000)]
Merge "Output annotations in sdk package-summary docs."
Jeff Sharkey [Thu, 17 Oct 2013 16:43:29 +0000 (09:43 -0700)]
am
7732eb5b: am
53619434: Merge "Add blkid to all builds for use by vold." into klp-dev
* commit '
7732eb5bbad2c8f0c2ea850bcc97cf19d4a6bc58':
Add blkid to all builds for use by vold.
Jeff Sharkey [Thu, 17 Oct 2013 16:40:29 +0000 (09:40 -0700)]
am
53619434: Merge "Add blkid to all builds for use by vold." into klp-dev
* commit '
53619434ed56043841256dfb2074662dbd0acc5e':
Add blkid to all builds for use by vold.
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:53:03 +0000 (17:53 -0700)]
am
c7334100: am
3b6bffcd: merge in klp-release (no-op)
* commit '
c73341006286c391ae4d268a77f5e008045d5308': (61 commits)
"KRT15D"
"KRT15C"
"KRT15B"
"KRT15"
"KRT14B"
"KRT14"
"KRT13B"
"KRT13"
"KRT10F"
"KRT10E"
"KRT10D"
"KRT10C"
"KRT10B"
"KRT10"
KRT09B
"KRT09"
"KRT08C"
"KRT08B"
So long Key Lime Pie, it was nice knowing you.
"KRT08"
...
Ed Heyl [Thu, 17 Oct 2013 00:47:50 +0000 (17:47 -0700)]
am
3b6bffcd: merge in klp-release (no-op)
* commit '
3b6bffcda4e66c86c87a6a29a412ef0949f19205': (61 commits)
"KRT15D"
"KRT15C"
"KRT15B"
"KRT15"
"KRT14B"
"KRT14"
"KRT13B"
"KRT13"
"KRT10F"
"KRT10E"
"KRT10D"
"KRT10C"
"KRT10B"
"KRT10"
KRT09B
"KRT09"
"KRT08C"
"KRT08B"
So long Key Lime Pie, it was nice knowing you.
"KRT08"
...
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:26:19 +0000 (17:26 -0700)]
am
011a38d1: am
2b205a58: am
919edbe7: am
1c094509: am
6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '
011a38d184c21d3c6195503244a2d4d31befbb28':
fix javadoc sidenav so it does not cutoff overflowing link names
Scott Main [Thu, 17 Oct 2013 00:23:45 +0000 (17:23 -0700)]
am
2b205a58: am
919edbe7: am
1c094509: am
6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '
2b205a5814c39d7b6e7c6646e3ec9da4dad6dcb8':
fix javadoc sidenav so it does not cutoff overflowing link names
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
Ben Cheng [Wed, 16 Oct 2013 19:28:38 +0000 (12:28 -0700)]
Point to the uapi header location for aarch64.
Change-Id: Ic42f5520eb0711c35aaf7106939ef83e449bda74
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
Brett Chabot [Fri, 4 Oct 2013 23:55:03 +0000 (16:55 -0700)]
Output annotations in sdk package-summary docs.
Bug
10749552
Bug
6333357
Change-Id: I57e97ee69d41bb8df5ea371a766ebb7e0602ff90
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:55:36 +0000 (10:55 -0700)]
am
8f9b10e5: am
866db61f: update dev build ID
* commit '
8f9b10e53bfad6c13e3b6b1b4514ab3f786c34e3':
update dev build ID
Ed Heyl [Tue, 15 Oct 2013 17:53:39 +0000 (10:53 -0700)]
am
866db61f: update dev build ID
* commit '
866db61fff4f6939a5655429b0600d8395acb7d7':
update dev build ID
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
Scott Main [Tue, 15 Oct 2013 11:03:35 +0000 (04:03 -0700)]
am
c14c27af: am
a3362a7f: am
d19a1ff4: am
3f4fcef5: am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
c14c27af745e8c5941e2b8359995c764689020a5':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Tue, 15 Oct 2013 02:00:51 +0000 (19:00 -0700)]
am
a3362a7f: am
d19a1ff4: am
3f4fcef5: am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
a3362a7f67b87e89f5d82cf62f51d6b36be008fc':
enable auto-linking to next lesson with 'next-page-link' css class
The Android Automerger [Mon, 14 Oct 2013 22:08:31 +0000 (15:08 -0700)]
"KRT14B"
Kenny Root [Mon, 14 Oct 2013 21:16:18 +0000 (14:16 -0700)]
am
16d2dccd: am
b0af7e51: am
cc68ce70: Merge "Allow ECDSA signing OTA files"
* commit '
16d2dccd09fdc82b1729986e85babf498749f02b':
Allow ECDSA signing OTA files
Kenny Root [Mon, 14 Oct 2013 21:13:44 +0000 (14:13 -0700)]
am
b0af7e51: am
cc68ce70: Merge "Allow ECDSA signing OTA files"
* commit '
b0af7e5107abb17fc756044454b3a452d0dafb50':
Allow ECDSA signing OTA files
Kenny Root [Mon, 14 Oct 2013 21:10:05 +0000 (14:10 -0700)]
am
cc68ce70: Merge "Allow ECDSA signing OTA files"
* commit '
cc68ce7012784a3d2ad12e041c8e82def74f20cd':
Allow ECDSA signing OTA files
Kenny Root [Mon, 14 Oct 2013 21:05:07 +0000 (21:05 +0000)]
Merge "Allow ECDSA signing OTA files"
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
Ian Rogers [Mon, 14 Oct 2013 17:49:31 +0000 (10:49 -0700)]
am
b07a5f82: am
09c6d68b: am
816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
* commit '
b07a5f825795b45b01de6bb90f4c43ef1aae506a':
Specify -mcpu=cortex-a15 for krait CPU variants.
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
Ian Rogers [Sat, 12 Oct 2013 00:35:09 +0000 (17:35 -0700)]
am
09c6d68b: am
816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
* commit '
09c6d68b8879164f600bbe084a62cfbc4ab10850':
Specify -mcpu=cortex-a15 for krait CPU variants.
Ian Rogers [Sat, 12 Oct 2013 00:33:16 +0000 (17:33 -0700)]
am
816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
* commit '
816af5fc0e4cf8f705ba0ffbb2842b5d7432e653':
Specify -mcpu=cortex-a15 for krait CPU variants.
Ian Rogers [Sat, 12 Oct 2013 00:30:31 +0000 (00:30 +0000)]
Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
Ian Rogers [Fri, 11 Oct 2013 22:52:53 +0000 (15:52 -0700)]
Specify -mcpu=cortex-a15 for krait CPU variants.
Bug:
11178216
Change-Id: I9922e4cd5ba27e3857798aae5c84299e26e054ea
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
Kenny Root [Wed, 9 Oct 2013 22:00:14 +0000 (15:00 -0700)]
Allow ECDSA signing OTA files
ECDSA works in the recovery verifier, so we can allow OTA updates to be
signed with EC keys.
Change-Id: If8f2be028843fbfd6c8c9c41b492605d9b5cbeb0
The Android Automerger [Wed, 9 Oct 2013 21:31:23 +0000 (14:31 -0700)]
KRT09B
Ed Heyl [Wed, 9 Oct 2013 16:13:03 +0000 (09:13 -0700)]
am
9512d6ed: am
b0ac4254: merge in KFS78N (no-op)
* commit '
9512d6edf68d3fddc8a27e95886be68a4c554fbf':
"KFS78N"
KFS78M
KFS78L
KFS78K
"KFS78J"
KFS78I
Remove Email from HH FactoryROM Bug:
10806060
"KFS78H"
"KFS78G"
KFS78F
KFS78E
KFS78D
KFS78C
"KFS78B"
Ed Heyl [Wed, 9 Oct 2013 16:12:04 +0000 (09:12 -0700)]
am
22264b3a: am
774e017e: merge in KQS81M
* commit '
22264b3acc419bbe85db7310aa6f83d0a07930f1': (95 commits)
KQS81M
"KQS81L"
"KQS81K"
"KQS81J"
"KQS81I"
"KQS81H"
KQS81G
KQS81F
Remove Email from HH FactoryROM Bug:
10806060
KQS81E
"KQS81D"
"KQS81C"
KQS81B
"KQS83"
KRS81G
"KRS81F"
"KRS81E"
"KRS81D"
"KRS81C"
"KRS81B"
...
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
Jamie Gennis [Wed, 9 Oct 2013 00:44:51 +0000 (17:44 -0700)]
am
1a63bb66: am
e652af1e: Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
* commit '
1a63bb6619df9413a6675addd93359de3409b539':
BoardConfig: Add and document vsync phase offset setting
Ben Cheng [Wed, 9 Oct 2013 00:44:45 +0000 (17:44 -0700)]
am
b8eaf684: am
0f324e3e: am
a7662295: Merge "Explictily specify the dynamic linker name."
* commit '
b8eaf684cb50cd73438b87fc5bfb33a08c823f72':
Explictily specify the dynamic linker name.
Andrew Hsieh [Tue, 8 Oct 2013 23:51:14 +0000 (23:51 +0000)]
Merge "Switch default GCC to 4.8 for X86/MIPS"
The Android Automerger [Tue, 8 Oct 2013 23:20:36 +0000 (16:20 -0700)]
"KRT08C"
Ed Heyl [Tue, 8 Oct 2013 23:11:51 +0000 (16:11 -0700)]
am
b0ac4254: merge in KFS78N (no-op)
* commit '
b0ac42546f70cb46d614d318eb04c8cc45bd87b3':
"KFS78N"
KFS78M
KFS78L
KFS78K
"KFS78J"
KFS78I
Remove Email from HH FactoryROM Bug:
10806060
"KFS78H"
"KFS78G"
KFS78F
KFS78E
KFS78D
KFS78C
"KFS78B"
Dianne Hackborn [Tue, 8 Oct 2013 22:58:47 +0000 (15:58 -0700)]
resolved conflicts for merge of
a3fd7bf0 to master
Change-Id: Ifcef32cbf9482aeec032e577c20761b74bdea775
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:45:47 +0000 (15:45 -0700)]
am
774e017e: merge in KQS81M
* commit '
774e017e6f21acf97c90f70dcb41c86efcb186de': (95 commits)
KQS81M
"KQS81L"
"KQS81K"
"KQS81J"
"KQS81I"
"KQS81H"
KQS81G
KQS81F
Remove Email from HH FactoryROM Bug:
10806060
KQS81E
"KQS81D"
"KQS81C"
KQS81B
"KQS83"
KRS81G
"KRS81F"
"KRS81E"
"KRS81D"
"KRS81C"
"KRS81B"
...
Ed Heyl [Tue, 8 Oct 2013 22:35:32 +0000 (15:35 -0700)]
merge in KQS81M
Jamie Gennis [Tue, 8 Oct 2013 22:13:47 +0000 (15:13 -0700)]
am
e652af1e: Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
* commit '
e652af1e808b2b15e23bc472f9be6592735a0a8e':
BoardConfig: Add and document vsync phase offset setting
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
Ben Cheng [Tue, 8 Oct 2013 21:47:34 +0000 (14:47 -0700)]
am
0f324e3e: am
a7662295: Merge "Explictily specify the dynamic linker name."
* commit '
0f324e3e35f1d5d55c7c06ac6b76a6ce7726e015':
Explictily specify the dynamic linker name.
Ben Cheng [Tue, 8 Oct 2013 21:44:22 +0000 (14:44 -0700)]
am
a7662295: Merge "Explictily specify the dynamic linker name."
* commit '
a7662295438e50a22979a012c873e3d16444bc42':
Explictily specify the dynamic linker name.
Ben Cheng [Tue, 8 Oct 2013 21:42:32 +0000 (21:42 +0000)]
Merge "Explictily specify the dynamic linker name."