Commit graph

12623 commits

Author SHA1 Message Date
Scott Main
01a2545bba docs: update templates to remove global content for devsite builds
Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c
2013-03-21 18:12:51 -07:00
The Android Automerger
0456082c6b JWQ80B 2013-03-21 16:08:14 -07:00
The Android Automerger
4a131b8d14 JWQ80 2013-03-21 05:57:05 -07:00
The Android Automerger
2d818b9b97 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-21 05:55:09 -07:00
Scott Main
b27e23a059 am 2d7a1955: am 1afc758e: am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '2d7a195598c5cb594adda42852383f350f8bac58':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 22:32:39 +00:00
Scott Main
2d7a195598 am 1afc758e: am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '1afc758e57d6f7c873111086e4c74614634a2856':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 22:30:40 +00:00
Scott Main
1afc758e57 am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '04f279730970df0ea5cd8ef6e8f7a5bee6233dc6':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:27:05 -07:00
Scott Main
04f2797309 am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '8c052d395db4643303e03efbc35eca0259cee19e':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:25:10 -07:00
Scott Main
8c052d395d am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '82fb80eb11188592f34056e8c787a74a28be6543':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:23:08 -07:00
Scott Main
82fb80eb11 am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit 'ec48ff2bed11b0cbdc2686eed28a6edc75425fca':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:20:42 -07:00
Scott Main
ec48ff2bed am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit 'ec93c11194f55fb2bd9ae23fa502d701bfb09664':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:18:08 -07:00
Scott Main
ec93c11194 Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs 2013-03-20 22:16:27 +00:00
Scott Main
a2303454fd add 64-bit variety NDK packages to download table.
Use same naming convention as SDK packages for consistency.

Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c
2013-03-20 15:01:35 -07:00
The Android Automerger
3cf2cf02aa JWQ79B 2013-03-20 14:37:24 -07:00
The Android Automerger
b225d8b17e JDQ39E 2013-03-20 12:24:22 -07:00
The Android Open Source Project
6183078afa am 851401fd: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '851401fdfea793003ac6106edf1e1b17edac5e2c':
  JWQ79
  JWQ78B
  JWQ78
  JWQ77B
  JWQ77
  JWQ73C
  JWQ73B
  JWQ73
  JWQ72B
  JWQ72
  JWQ71B
2013-03-20 16:41:58 +00:00
The Android Open Source Project
851401fdfe Reconcile with jb-mr2-release - do not merge
Change-Id: I548290b010c4622ea6c765453284decd219bb77d
2013-03-20 09:32:13 -07:00
The Android Automerger
9b8ce9c7d8 JWQ79 2013-03-20 05:57:16 -07:00
The Android Automerger
74d2c90590 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-20 05:55:12 -07:00
The Android Automerger
e0fdbf1878 JWQ78B 2013-03-19 16:53:50 -07:00
Scott Main
51b7898dea am b21f6386: am 18fbd22d: am 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit 'b21f63864bb349d110bcbfb65928cc3a3f00645b':
  fix indentation style for nested lists
2013-03-19 21:52:42 +00:00
Scott Main
b21f63864b am 18fbd22d: am 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '18fbd22dffb106181a4a3e8cfbfc1726e9199fa3':
  fix indentation style for nested lists
2013-03-19 21:49:53 +00:00
Scott Main
18fbd22dff am 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '22b048e1069c5f5dffd5f13ee4ef35f4ba06fa2b':
  fix indentation style for nested lists
2013-03-19 14:48:42 -07:00
Scott Main
22b048e106 am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '86372f1c0156b096288274ab85128ffbe9f6f8b4':
  fix indentation style for nested lists
2013-03-19 14:48:02 -07:00
Scott Main
86372f1c01 am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '7524d02ef25fed9241e507ebda53d73a643134e5':
  fix indentation style for nested lists
2013-03-19 14:46:48 -07:00
Scott Main
7524d02ef2 am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '4264799b51dd24fdc154a1ae1b70bc4e0bf7e4a9':
  fix indentation style for nested lists
2013-03-19 14:44:53 -07:00
Scott Main
4264799b51 am 24790db1: fix indentation style for nested lists
* commit '24790db1cd7b84c6c36350b232538e519790f799':
  fix indentation style for nested lists
2013-03-19 14:43:04 -07:00
Scott Main
24790db1cd fix indentation style for nested lists
Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453
2013-03-19 14:38:59 -07:00
Andrew Hsieh
f44fa0828b am 726bfa57: am 79a6b76e: am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '726bfa57d82e4214bbca5b64b93ee06a9436799c':
  Duplicate libgcc.a in front of *so
2013-03-19 18:21:42 +00:00
Andrew Hsieh
726bfa57d8 am 79a6b76e: am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '79a6b76ec8a2af8898920806431fe5d806e0155e':
  Duplicate libgcc.a in front of *so
2013-03-19 18:19:26 +00:00
Andrew Hsieh
79a6b76ec8 am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit 'e874f3ab7c3f70582f877e762c13c1943ed0e398':
  Duplicate libgcc.a in front of *so
2013-03-19 11:17:07 -07:00
Andrew Hsieh
e874f3ab7c am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '55c06f75951c0d31560f90822cd4e5073055855c':
  Duplicate libgcc.a in front of *so
2013-03-19 11:15:49 -07:00
Andrew Hsieh
55c06f7595 Merge "Duplicate libgcc.a in front of *so" 2013-03-19 17:59:51 +00:00
Ben Cheng
de03c3f49e am 69b9ffa3: am 53fda201: am 870af852: am e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit '69b9ffa3a8bbe058eff05c5d4063a86bfcfc0139':
  Link libgcc.a before shared libraries (especially libc.so).
2013-03-19 16:39:47 +00:00
Ben Cheng
69b9ffa3a8 am 53fda201: am 870af852: am e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit '53fda201b5a591bbda8ab8e2f307f433f53f5cb7':
  Link libgcc.a before shared libraries (especially libc.so).
2013-03-19 16:32:51 +00:00
Ben Cheng
53fda201b5 am 870af852: am e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit '870af852348e700fd7a6d47a4388b249c27a3d8d':
  Link libgcc.a before shared libraries (especially libc.so).
2013-03-19 09:30:43 -07:00
Andrew Hsieh
8725b941b0 Duplicate libgcc.a in front of *so
Also see 6c7bc550ad

Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
2013-03-19 07:51:52 -07:00
The Android Automerger
1935014378 JWQ78 2013-03-19 05:56:36 -07:00
The Android Automerger
1e20705df3 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-19 05:55:05 -07:00
The Android Automerger
1be8428490 JWQ77B 2013-03-18 18:27:55 -07:00
Ben Cheng
870af85234 am e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit 'e03142454b52d9960a93b04f75c1a9487720a73a':
  Link libgcc.a before shared libraries (especially libc.so).
2013-03-18 15:21:07 -07:00
Ben Cheng
e03142454b Merge "Link libgcc.a before shared libraries (especially libc.so)." 2013-03-18 21:05:23 +00:00
Ben Cheng
6c7bc550ad Link libgcc.a before shared libraries (especially libc.so).
[cherry-picked from internal master]

Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
2013-03-18 14:00:44 -07:00
The Android Automerger
44f38bf6ec JWQ77 2013-03-18 05:58:12 -07:00
The Android Automerger
7aeacb922e merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-18 05:55:25 -07:00
Lorenzo Colitti
98a338f9a4 am a46802b1: am 6aaf5895: Include clatd in device builds.
* commit 'a46802b1ec5e02f133349213fd6cc82849902418':
  Include clatd in device builds.
2013-03-17 16:27:57 +00:00
Lorenzo Colitti
a46802b1ec am 6aaf5895: Include clatd in device builds.
* commit '6aaf5895eccabf7ec7e4ab961aef2ffbdda26715':
  Include clatd in device builds.
2013-03-17 16:24:00 +00:00
Lorenzo Colitti
6aaf5895ec Include clatd in device builds.
Bug: 8276725
Change-Id: I6a4e9c9829ef676c6a3080c03a709be3ec863de5
2013-03-16 09:48:11 +09:00
The Android Automerger
bd73daca63 JWQ73C 2013-03-15 12:58:19 -07:00
Ying Wang
c2749e90e6 am ddc85a1c: am d7321d31: Skip userdata.img only if partition size is not give for extfs.
* commit 'ddc85a1cfbcc3003560c010ab69fa29d3e83b8c5':
  Skip userdata.img only if partition size is not give for extfs.
2013-03-15 17:38:56 +00:00