OSDN Git Service

android-x86/build.git
10 years agoFix droiddoc generation.
Narayan Kamath [Fri, 25 Oct 2013 14:55:46 +0000 (15:55 +0100)]
Fix droiddoc generation.

We want javadoc generated from the standard libraries
we supply and not the host standard libraries.

This also has the side effect of fixing javadoc generation
for java7 APIs that android introduced, while compiling
with java6.

bug: 8992787
Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d

10 years agoam f9f05814: am 0068d25b: Include drawables for all densities - b/11270325
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

10 years agoam 0068d25b: 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

10 years agoInclude 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

10 years agoam 8f55b16f: am ad6996a6: am 34cf868b: Merge "Point to the uapi header location for...
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.

10 years agoam ad6996a6: am 34cf868b: Merge "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.

10 years agoam 34cf868b: Merge "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.

10 years agoMerge "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."

10 years agoMerge "Output annotations in sdk package-summary docs."
Brett Chabot [Thu, 17 Oct 2013 17:01:04 +0000 (17:01 +0000)]
Merge "Output annotations in sdk package-summary docs."

10 years agoam 7732eb5b: am 53619434: Merge "Add blkid to all builds for use by vold." into klp-dev
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.

10 years agoam 53619434: Merge "Add blkid to all builds for use by vold." into klp-dev
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.

10 years agoMerge "Add blkid to all builds for use by vold." into klp-dev
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

10 years agoam c7334100: am 3b6bffcd: merge in klp-release (no-op)
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"
  ...

10 years agoam 3b6bffcd: merge in klp-release (no-op)
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"
  ...

10 years agomerge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:34:58 +0000 (17:34 -0700)]
merge in klp-release (no-op)

10 years agoam 011a38d1: am 2b205a58: am 919edbe7: am 1c094509: am 6c030b73: fix javadoc sidenav...
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

10 years agoam 2b205a58: am 919edbe7: am 1c094509: am 6c030b73: fix javadoc sidenav so it does...
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

10 years agoam 919edbe7: am 1c094509: am 6c030b73: fix javadoc sidenav so it does not cutoff...
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

10 years agoam 1c094509: am 6c030b73: fix javadoc sidenav so it does not cutoff overflowing link...
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

10 years agoam 6c030b73: 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

10 years agofix 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

10 years agoAdd blkid to all builds for use by vold.
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

10 years agoPoint to the uapi header location for aarch64.
Ben Cheng [Wed, 16 Oct 2013 19:28:38 +0000 (12:28 -0700)]
Point to the uapi header location for aarch64.

Change-Id: Ic42f5520eb0711c35aaf7106939ef83e449bda74

10 years ago"KRT15D"
The Android Automerger [Wed, 16 Oct 2013 08:32:29 +0000 (01:32 -0700)]
"KRT15D"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 16 Oct 2013 08:31:32 +0000 (01:31 -0700)]
merge in klp-release history after reset to klp-dev

10 years ago"KRT15C"
The Android Automerger [Wed, 16 Oct 2013 04:15:05 +0000 (21:15 -0700)]
"KRT15C"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 16 Oct 2013 04:13:52 +0000 (21:13 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoOutput annotations in sdk package-summary docs.
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

10 years ago"KRT15B"
The Android Automerger [Tue, 15 Oct 2013 22:57:09 +0000 (15:57 -0700)]
"KRT15B"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 22:55:16 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam 8f9b10e5: am 866db61f: update dev build ID
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

10 years agoam 866db61f: 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

10 years agoupdate dev build ID
Ed Heyl [Tue, 15 Oct 2013 17:37:53 +0000 (10:37 -0700)]
update dev build ID

Change-Id: Icb95a91c7d7ed6754438b5d6bd188cdb3f85a005

10 years ago"KRT15"
The Android Automerger [Tue, 15 Oct 2013 13:02:48 +0000 (06:02 -0700)]
"KRT15"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 13:00:21 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam c14c27af: am a3362a7f: am d19a1ff4: am 3f4fcef5: am 25c89dda: enable auto-linking...
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

10 years agoam a3362a7f: am d19a1ff4: am 3f4fcef5: am 25c89dda: enable auto-linking to next lesso...
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

10 years ago"KRT14B"
The Android Automerger [Mon, 14 Oct 2013 22:08:31 +0000 (15:08 -0700)]
"KRT14B"

10 years agoam 16d2dccd: am b0af7e51: am cc68ce70: Merge "Allow ECDSA signing OTA files"
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

10 years agoam b0af7e51: am cc68ce70: Merge "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

10 years agoam cc68ce70: Merge "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

10 years agoMerge "Allow ECDSA signing OTA files"
Kenny Root [Mon, 14 Oct 2013 21:05:07 +0000 (21:05 +0000)]
Merge "Allow ECDSA signing OTA files"

10 years agoam d19a1ff4: am 3f4fcef5: am 25c89dda: enable auto-linking to next lesson with \...
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

10 years agoam 3f4fcef5: am 25c89dda: enable auto-linking to next lesson with \'next-page-link...
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

10 years agoam 25c89dda: 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

10 years agoenable 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

10 years agoam b07a5f82: am 09c6d68b: am 816af5fc: Merge "Specify -mcpu=cortex-a15 for krait...
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.

10 years ago"KRT14"
The Android Automerger [Mon, 14 Oct 2013 13:01:12 +0000 (06:01 -0700)]
"KRT14"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 14 Oct 2013 13:00:07 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years ago"KRT13B"
The Android Automerger [Mon, 14 Oct 2013 02:21:10 +0000 (19:21 -0700)]
"KRT13B"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 14 Oct 2013 02:19:48 +0000 (19:19 -0700)]
merge in klp-release history after reset to klp-dev

10 years ago"KRT13"
The Android Automerger [Sun, 13 Oct 2013 13:04:12 +0000 (06:04 -0700)]
"KRT13"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:01:15 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam 09c6d68b: am 816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
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.

10 years agoam 816af5fc: Merge "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.

10 years agoMerge "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."

10 years agoSpecify -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

10 years ago"KRT10F"
The Android Automerger [Fri, 11 Oct 2013 19:42:28 +0000 (12:42 -0700)]
"KRT10F"

10 years ago"KRT10E"
The Android Automerger [Fri, 11 Oct 2013 17:35:47 +0000 (10:35 -0700)]
"KRT10E"

10 years ago"KRT10D"
The Android Automerger [Fri, 11 Oct 2013 05:13:46 +0000 (22:13 -0700)]
"KRT10D"

10 years ago"KRT10C"
The Android Automerger [Thu, 10 Oct 2013 23:27:26 +0000 (16:27 -0700)]
"KRT10C"

10 years ago"KRT10B"
The Android Automerger [Thu, 10 Oct 2013 19:17:09 +0000 (12:17 -0700)]
"KRT10B"

10 years ago"KRT10"
The Android Automerger [Thu, 10 Oct 2013 13:02:56 +0000 (06:02 -0700)]
"KRT10"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 10 Oct 2013 13:00:28 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoAllow ECDSA signing OTA files
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

10 years agoKRT09B
The Android Automerger [Wed, 9 Oct 2013 21:31:23 +0000 (14:31 -0700)]
KRT09B

10 years agoam 9512d6ed: am b0ac4254: merge in KFS78N (no-op)
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"

10 years agoam 22264b3a: am 774e017e: merge in KQS81M
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"
  ...

10 years ago"KRT09"
The Android Automerger [Wed, 9 Oct 2013 13:03:26 +0000 (06:03 -0700)]
"KRT09"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 9 Oct 2013 13:00:32 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam 1a63bb66: am e652af1e: Merge "BoardConfig: Add and document vsync phase offset...
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

10 years agoam b8eaf684: am 0f324e3e: am a7662295: Merge "Explictily specify the dynamic linker...
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.

10 years agoMerge "Switch default GCC to 4.8 for X86/MIPS"
Andrew Hsieh [Tue, 8 Oct 2013 23:51:14 +0000 (23:51 +0000)]
Merge "Switch default GCC to 4.8 for X86/MIPS"

10 years ago"KRT08C"
The Android Automerger [Tue, 8 Oct 2013 23:20:36 +0000 (16:20 -0700)]
"KRT08C"

10 years agoam b0ac4254: merge in KFS78N (no-op)
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"

10 years agoresolved conflicts for merge of a3fd7bf0 to master
Dianne Hackborn [Tue, 8 Oct 2013 22:58:47 +0000 (15:58 -0700)]
resolved conflicts for merge of a3fd7bf0 to master

Change-Id: Ifcef32cbf9482aeec032e577c20761b74bdea775

10 years agomerge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:56:09 +0000 (15:56 -0700)]
merge in KFS78N (no-op)

10 years agoam 774e017e: merge in KQS81M
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"
  ...

10 years agomerge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:35:32 +0000 (15:35 -0700)]
merge in KQS81M

10 years agoam e652af1e: Merge "BoardConfig: Add and document vsync phase offset setting" into...
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

10 years agoMerge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
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

10 years agoam 0f324e3e: am a7662295: Merge "Explictily specify the dynamic linker name."
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.

10 years agoam a7662295: Merge "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.

10 years agoMerge "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."

10 years ago"KRT08B"
The Android Automerger [Tue, 8 Oct 2013 21:20:33 +0000 (14:20 -0700)]
"KRT08B"

10 years agoSo long Key Lime Pie, it was nice knowing you.
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

10 years agoExplictily specify the dynamic linker name.
Ben Cheng [Tue, 8 Oct 2013 21:19:50 +0000 (14:19 -0700)]
Explictily specify the dynamic linker name.

Change-Id: Ie456f19cbe3dc8e3a9677638cc705b6eaf77c2b4

10 years agoam 6a4d3339: So long Key Lime Pie, it was nice knowing you.
Dianne Hackborn [Tue, 8 Oct 2013 19:08:36 +0000 (12:08 -0700)]
am 6a4d3339: So long Key Lime Pie, it was nice knowing you.

* commit '6a4d33390769d80113f16d383506dc9238e1d5fc':
  So long Key Lime Pie, it was nice knowing you.

10 years agoam 5dec2c77: am 1180d71c: am 2c448765: Merge "Remove explicit passing of dynamic...
Elliott Hughes [Tue, 8 Oct 2013 17:16:45 +0000 (10:16 -0700)]
am 5dec2c77: am 1180d71c: am 2c448765: Merge "Remove explicit passing of dynamic loader name"

* commit '5dec2c77032436a1e03644c7830d9d3ffc1ec8d4':
  Remove explicit passing of dynamic loader name

10 years agoam 1180d71c: am 2c448765: Merge "Remove explicit passing of dynamic loader name"
Elliott Hughes [Tue, 8 Oct 2013 17:12:28 +0000 (10:12 -0700)]
am 1180d71c: am 2c448765: Merge "Remove explicit passing of dynamic loader name"

* commit '1180d71c3062a4f5b124ced3693a6a937ffbc13a':
  Remove explicit passing of dynamic loader name

10 years agoam 2c448765: Merge "Remove explicit passing of dynamic loader name"
Elliott Hughes [Tue, 8 Oct 2013 17:10:51 +0000 (10:10 -0700)]
am 2c448765: Merge "Remove explicit passing of dynamic loader name"

* commit '2c448765e1227327da7ce548114f13678baa9606':
  Remove explicit passing of dynamic loader name

10 years agoMerge "Remove explicit passing of dynamic loader name"
Elliott Hughes [Tue, 8 Oct 2013 17:09:03 +0000 (17:09 +0000)]
Merge "Remove explicit passing of dynamic loader name"

10 years ago"KRT08"
The Android Automerger [Tue, 8 Oct 2013 13:02:29 +0000 (06:02 -0700)]
"KRT08"

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 8 Oct 2013 13:00:18 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoRemove explicit passing of dynamic loader name
Pavel Chupin [Tue, 8 Oct 2013 07:35:39 +0000 (11:35 +0400)]
Remove explicit passing of dynamic loader name

We should trust toolchain on that.

Change-Id: I20dd882d167cc84c262aef245ea2d86c17bc1785
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
10 years agoBoardConfig: Add and document vsync phase offset setting
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

10 years ago"KRT07B"
The Android Automerger [Mon, 7 Oct 2013 23:33:42 +0000 (16:33 -0700)]
"KRT07B"

10 years agoam a698dab8: am 0b42554f: am 12eeb000: Merge "Add generic aarch64 board config and...
Ben Cheng [Mon, 7 Oct 2013 21:44:05 +0000 (14:44 -0700)]
am a698dab8: am 0b42554f: am 12eeb000: Merge "Add generic aarch64 board config and build rules."

* commit 'a698dab816aa79c88b14a84b9701ca48645bf70d':
  Add generic aarch64 board config and build rules.

10 years agoam 0b42554f: am 12eeb000: Merge "Add generic aarch64 board config and build rules."
Ben Cheng [Mon, 7 Oct 2013 21:42:10 +0000 (14:42 -0700)]
am 0b42554f: am 12eeb000: Merge "Add generic aarch64 board config and build rules."

* commit '0b42554fd8c7a43ca45504e4586f1eef578308de':
  Add generic aarch64 board config and build rules.

10 years agoam 12eeb000: Merge "Add generic aarch64 board config and build rules."
Ben Cheng [Mon, 7 Oct 2013 21:40:42 +0000 (14:40 -0700)]
am 12eeb000: Merge "Add generic aarch64 board config and build rules."

* commit '12eeb000601883256f306c2c6932cda4d768e97a':
  Add generic aarch64 board config and build rules.