Commit graph

7644 commits

Author SHA1 Message Date
Raphael Moll
a8dd58a8a6 Merge "Allow make 3.82 to be used under Cygwin 1.7" 2012-03-27 16:16:45 -07:00
Raphael Moll
4c45699015 Allow make 3.82 to be used under Cygwin 1.7
(Manual merge of 76bf62d75e)

Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
2012-03-27 14:35:34 -07:00
Raphael Moll
3b1ebe7dc2 Merge "SDK atree: support HOST_OUT location." 2012-03-27 11:40:47 -07:00
Jean-Baptiste Queru
d17c89776e am 0b6a436f: Merge "Fix build"
* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
  Fix build
2012-03-27 08:07:09 -07:00
Jean-Baptiste Queru
0b6a436f09 Merge "Fix build" 2012-03-27 07:37:58 -07:00
Glenn Kasten
f396f56817 Fix build
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
2012-03-27 07:24:24 -07:00
The Android Open Source Project
6e271c76b6 Reconcile with ics-mr1-release
Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157
2012-03-26 09:47:10 -07:00
The Android Automerger
0db00f2ebf IMM76D 2012-03-25 12:34:33 -07:00
The Android Automerger
b9624520b4 IMM76C 2012-03-23 14:38:56 -07:00
Andrew Hsieh
5d9aedef30 am 2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '2245d17dc847ecb5371807466788552ca0198152':
  Point to new linux prebuilt toolchain for SDK build
2012-03-22 11:03:14 -07:00
Andrew Hsieh
2245d17dc8 Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
2012-03-22 09:55:36 -07:00
Raphael Moll
74160ed4c4 SDK atree: support HOST_OUT location.
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
2012-03-21 22:34:48 -07:00
The Android Open Source Project
7000342da9 Reconcile with ics-mr1-release
Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8
2012-03-21 08:22:52 -07:00
The Android Automerger
54578dd1aa IMM76B 2012-03-20 17:15:23 -07:00
Ying Wang
4243532d4a am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '301843ae3e5a5d121ecc01b58ea3f15ae07c860f':
  Fix for "dexopt: No such file or directory" error
2012-03-20 15:22:30 -07:00
Ying Wang
301843ae3e am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
  Fix for "dexopt: No such file or directory" error
2012-03-20 15:20:14 -07:00
Ying Wang
29e44b7a83 Merge "Fix for "dexopt: No such file or directory" error" 2012-03-20 11:05:56 -07:00
The Android Automerger
fe0a544ea6 IMM76 2012-03-16 19:36:35 -07:00
The Android Automerger
83defc2504 merge in ics-mr1-release history after reset to ics-mr1 2012-03-16 19:30:18 -07:00
The Android Automerger
3ca86b2abd IMM72B 2012-03-13 17:16:36 -07:00
The Android Automerger
f44b3505ad IMM72 2012-03-12 19:36:17 -07:00
The Android Automerger
ca97d052d7 merge in ics-mr1-release history after reset to ics-mr1 2012-03-12 19:30:56 -07:00
The Android Automerger
031e57b381 second try 2012-03-11 00:58:08 -08:00
The Android Automerger
c3afa8fe03 IMM68C 2012-03-10 09:10:29 -08:00
The Android Automerger
4ea508be53 IMM70 2012-03-10 09:08:53 -08:00
The Android Automerger
eda3c63afd merge in ics-mr1-release history after reset to ics-mr1 2012-03-10 09:06:03 -08:00
The Android Automerger
3a81843786 IMM62B 2012-03-09 19:28:10 -08:00
The Android Automerger
187d092908 IMM69 2012-03-09 19:25:45 -08:00
The Android Automerger
8015f31215 merge in ics-mr1-release history after reset to ics-mr1 2012-03-09 19:22:16 -08:00
The Android Automerger
03fb636144 IMM68B 2012-03-09 09:59:12 -08:00
The Android Automerger
15ad8cccaa IMM68 2012-03-08 20:49:08 -08:00
The Android Automerger
ec1f6f1259 merge in ics-mr1-release history after reset to ics-mr1 2012-03-08 20:42:40 -08:00
Roman Nurik
a23a3d8314 am d9ca90b4: Add SDK template and assets for Android Design
* commit 'd9ca90b4b9bd631329e6241b1ac4824ad0821639':
  Add SDK template and assets for Android Design
2012-03-06 14:41:13 -08:00
Roman Nurik
d9ca90b4b9 Add SDK template and assets for Android Design
Change-Id: Id7a953bf59e5e05242c46cdfb2b425e80424fc2f
2012-03-06 14:31:15 -08:00
Dirk Dougherty
79736c72c2 am 7d114b19: doc change: assets for play
* commit '7d114b195d2224ba8c6f8e156467b969317e0bf9':
  doc change: assets for play
2012-03-05 21:39:25 -08:00
Dirk Dougherty
7d114b195d doc change: assets for play
Change-Id: I58647fd0059c5de54dd7665527a73f61e0d2dd32
2012-03-05 21:36:28 -08:00
The Android Open Source Project
f1b829d19d Reconcile with ics-mr1-release
Change-Id: I7b6a55cf5ad81aa9ddfd4706a4f5998d3153534e
2012-03-02 16:32:48 -08:00
The Android Automerger
081c50ffc5 IMM62 2012-03-02 11:55:21 -08:00
The Android Automerger
bcebabb5e8 merge in ics-mr1-release history after reset to ics-mr1 2012-03-02 11:49:21 -08:00
The Android Open Source Project
2ab3572ba3 Reconcile with ics-mr1-release
Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9
2012-03-01 10:11:36 -08:00
The Android Automerger
067153c059 IMM59 2012-02-28 15:18:24 -08:00
The Android Automerger
0a759438e9 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:12:45 -08:00
The Android Automerger
17e1ba6b5d IMM56D 2012-02-27 16:10:34 -08:00
The Android Automerger
82118d78ac merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 16:09:47 -08:00
The Android Automerger
52ce071c40 IMM56C 2012-02-27 14:44:07 -08:00
The Android Automerger
dae73146eb merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 14:41:50 -08:00
The Android Automerger
8246e7fb0e IMM56B 2012-02-27 12:31:17 -08:00
The Android Automerger
e6e8cdf716 merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 12:28:07 -08:00
The Android Automerger
7a2051fd01 IMM56 2012-02-25 10:45:47 -08:00
The Android Automerger
8e86f0581c merge in ics-mr1-release history after reset to ics-mr1 2012-02-25 10:41:34 -08:00