Commit graph

10227 commits

Author SHA1 Message Date
The Android Automerger
b10de3ea3a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 06:59:07 -07:00
The Android Automerger
bc1e541fcf JOP10E 2012-10-10 19:21:32 -07:00
Christopher Tate
fd671b2d5f Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev 2012-10-10 15:35:00 -07:00
Christopher Tate
a3f11e6e66 Add the new 'settings' shell tool to the build
The tool isn't useful unless it's actually built into products.

Bug 7299066

Change-Id: I9aaf37bde73a986d871eac6fd4dea15c192110cb
2012-10-10 14:13:59 -07:00
The Android Automerger
07da118d1c JOP10D 2012-10-10 14:08:03 -07:00
The Android Automerger
31a3c86bac merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 14:06:21 -07:00
Ying Wang
57ddcb1bbc Support to build executables against the NDK
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.

Bug: 7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b
2012-10-10 10:24:26 -07:00
The Android Automerger
fc7d0c70e6 JOP10C 2012-10-10 09:58:54 -07:00
The Android Automerger
bcdd6fc0d2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 09:58:25 -07:00
The Android Automerger
8a0bada351 JOP10B 2012-10-10 09:52:55 -07:00
The Android Automerger
07d1f65113 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 09:51:58 -07:00
The Android Automerger
9f4f06ff13 JOP10 2012-10-10 07:00:50 -07:00
The Android Automerger
d0f1c3d794 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:08 -07:00
The Android Automerger
392b8647c7 JOP09D 2012-10-09 22:59:46 -07:00
The Android Automerger
a0b204b06b JOP09C 2012-10-09 17:54:34 -07:00
The Android Automerger
672dc693c6 JOP09B 2012-10-09 16:10:49 -07:00
The Android Automerger
26375f7f37 JOP08 2012-10-09 16:07:43 -07:00
The Android Automerger
fd0b6532cd merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 16:07:18 -07:00
The Android Automerger
3dbf42be09 JOP08wq! 2012-10-09 16:01:50 -07:00
The Android Automerger
0a160481e7 JOP09 2012-10-09 07:00:54 -07:00
The Android Automerger
949a5c467e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 06:59:06 -07:00
The Android Automerger
ada6ef0ec1 JOP08B 2012-10-08 16:08:35 -07:00
Scott Main
d73053a814 am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
* commit 'b282c359fcbde7f36b579cde388ca044a0dd6d60':
  fix layout bug on API Guide landing pages
2012-10-08 16:06:43 -07:00
Scott Main
b282c359fc am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
* commit '126c5e9205263f097af4d0f9dca3b10c9a02d72b':
  fix layout bug on API Guide landing pages
2012-10-08 16:04:25 -07:00
Scott Main
126c5e9205 am e6850d2d: fix layout bug on API Guide landing pages
* commit 'e6850d2db787a4e268b5cee57d74e9308180a589':
  fix layout bug on API Guide landing pages
2012-10-08 16:02:05 -07:00
Scott Main
e6850d2db7 fix layout bug on API Guide landing pages
Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a
2012-10-08 15:59:01 -07:00
The Android Automerger
8a2f6e55ca JOP08 2012-10-08 07:00:04 -07:00
The Android Automerger
320efc5870 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-08 06:59:05 -07:00
The Android Automerger
2f3197d8d4 JOP07D 2012-10-07 18:59:00 -07:00
The Android Automerger
543c9db0b0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 18:57:48 -07:00
The Android Automerger
2841fd4c62 JOP07C 2012-10-07 16:06:32 -07:00
The Android Automerger
37cb7a82e8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 16:05:02 -07:00
The Android Automerger
0dac92f803 JOP07B 2012-10-07 15:05:44 -07:00
The Android Automerger
de5ce161f7 JOP07 2012-10-07 07:00:38 -07:00
The Android Automerger
e8617dff2b merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 06:59:05 -07:00
The Android Automerger
9caec8e36d JOP05E 2012-10-06 00:39:03 -07:00
The Android Automerger
4020b35379 JOP05D 2012-10-05 17:28:51 -07:00
The Android Automerger
6c8725182b JOP05C 2012-10-05 15:09:28 -07:00
Keun young Park
f6e6bf7edf add mip32 stuffs to clang's unknown flag list
- mini_mips changed to mips32-fp to accomodate all mips variants

Bug: 7294949
Change-Id: Iae759e10e3f5d255e27b688042477263438bb7a7
2012-10-05 13:26:19 -07:00
The Android Automerger
56dc102183 JOP05B 2012-10-05 12:32:34 -07:00
The Android Automerger
8f456399e7 JOP05 2012-10-05 07:01:14 -07:00
The Android Automerger
9baa9119be merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-05 06:59:13 -07:00
The Android Automerger
4c1e35244b JOP04C 2012-10-04 16:58:19 -07:00
The Android Automerger
533aa6f3c0 JOP04B 2012-10-04 14:22:52 -07:00
Ying Wang
af4299c56d Merge "Store vendor module owner info on the build server." into jb-mr1-dev 2012-10-04 10:01:14 -07:00
The Android Automerger
4791318374 JOP04 2012-10-04 07:01:31 -07:00
The Android Automerger
3b95d03be4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 06:59:12 -07:00
Ying Wang
fb03fb3ec0 Store vendor module owner info on the build server.
Bug: 7048854
Change-Id: I5f0653c71a77774978655f8b5570e170b4a9c4ec
2012-10-03 17:52:51 -07:00
Scott Main
be1df522a9 am ded6dc01: am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
* commit 'ded6dc0137fb0632f9de47870fb923567ea22b17':
  add analytics tracking event for sdk/ndk downloads
2012-10-03 17:41:59 -07:00
Scott Main
ded6dc0137 am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
* commit '860287560db20e6f46a282284d8a04d5e001d2ea':
  add analytics tracking event for sdk/ndk downloads
2012-10-03 17:40:45 -07:00