Commit graph

12839 commits

Author SHA1 Message Date
The Android Open Source Project
349490646f Reconcile with jb-mr2-release - do not merge
Change-Id: Ic2bedc28934c86a1d84c86ef081abba066b9f1e7
2013-05-29 08:05:48 -07:00
The Android Automerger
1e6107149f "JWR59" 2013-05-29 05:56:24 -07:00
The Android Automerger
549bc87583 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-29 05:55:06 -07:00
The Android Automerger
293deacab2 JWR58C 2013-05-28 18:15:01 -07:00
The Android Automerger
262d805451 JWR58B 2013-05-28 16:11:03 -07:00
The Android Open Source Project
95940790ad Reconcile with jb-mr2-release - do not merge
Change-Id: I2a3754df164d9a9b56a1db167e0f10369e92efbe
2013-05-28 07:37:14 -07:00
The Android Automerger
e796456cd4 "JWR58" 2013-05-28 05:55:19 -07:00
The Android Automerger
73b3e135ba merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-28 05:55:03 -07:00
The Android Automerger
ca175af8af "JWR57" 2013-05-27 05:55:38 -07:00
The Android Automerger
9247f9f66a merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-27 05:55:05 -07:00
The Android Automerger
00f6b9bae5 "JWR56" 2013-05-26 05:56:30 -07:00
The Android Automerger
dc9e4445f4 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-26 05:55:10 -07:00
The Android Open Source Project
94bcfa0a09 Reconcile with jb-mr2-release - do not merge
Change-Id: I541e66a266a81d270b206ead6c8b5b67489d63ef
2013-05-24 15:28:07 -07:00
The Android Automerger
23b0797c03 JWR53F 2013-05-24 15:21:35 -07:00
The Android Automerger
058ea7d941 JWR53E 2013-05-24 12:23:06 -07:00
The Android Automerger
e30590f90a JWR53D 2013-05-23 22:09:57 -07:00
The Android Automerger
e4f52fb70a JWR53C 2013-05-23 19:58:17 -07:00
The Android Automerger
2803c67c42 JWR53B 2013-05-23 14:35:29 -07:00
The Android Open Source Project
5d8d181494 Reconcile with jb-mr2-release - do not merge
Change-Id: Ia0eaeb088ba74ba025573ac25315bc8d426a6a5b
2013-05-23 08:04:40 -07:00
The Android Automerger
9eb9f2d0af "JWR53" 2013-05-23 05:56:28 -07:00
The Android Automerger
059d22c259 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-23 05:55:11 -07:00
The Android Automerger
6f0c461388 JWR52B 2013-05-22 19:10:49 -07:00
The Android Open Source Project
ab9fd48163 Reconcile with jb-mr2-release - do not merge
Change-Id: Id47cc82d638cc12e7db5abf7e9f6a0a164e551f3
2013-05-22 07:22:42 -07:00
The Android Automerger
73e32267c0 "JWR52" 2013-05-22 05:56:16 -07:00
The Android Automerger
bc535d3448 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-22 05:55:08 -07:00
The Android Automerger
45fc413973 JWR51B 2013-05-21 17:18:17 -07:00
Ying Wang
210aee35a9 am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
* commit 'fa29872ae08408f90e1282bff36a0bdba13d0fdc':
  [MIPS] Disabled madd support for Ingenic Xburst CPUs.
2013-05-21 12:25:39 -07:00
Ying Wang
fa29872ae0 Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs." 2013-05-21 18:33:32 +00:00
The Android Open Source Project
fd5b59feba Reconcile with jb-mr2-release - do not merge
Change-Id: I5ea4651068ddbac4e42244bd638b8cce98f03be2
2013-05-21 08:58:48 -07:00
The Android Automerger
94c03acdb5 "JWR51" 2013-05-21 07:47:57 -07:00
The Android Automerger
0d1eb648d1 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-21 07:46:33 -07:00
The Android Automerger
69a1b28ac8 JWR50B 2013-05-20 17:09:55 -07:00
gcondra@google.com
cc9c2135bc am 2e619b7c: Revert "Add the sepolicy.version file to the root directory."
* commit '2e619b7c5458cb3b381bd8a02076f549dba8d045':
  Revert "Add the sepolicy.version file to the root directory."
2013-05-20 15:52:26 -07:00
Pete Delaney
90ce453470 [MIPS] Disabled madd support for Ingenic Xburst CPUs.
1. Added xburst ARCH_VARIANT file 'mips32r2-fp-xburst.mk'.
   a) Added -mno-fused-madd GCC option.

2. Removing -mno-fused-madd GCC option for LLVM.


Change-Id: I947a74eb89c05ae321417533c3c40241abc6f965
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
2013-05-20 15:27:20 -07:00
Jean-Baptiste Queru
64dbf369a8 Fake version number for AOSP master - do not merge
Change-Id: Ib605660f5baabf791bbbefb5d73dbe90e85ad51d
2013-05-20 09:50:39 -07:00
The Android Open Source Project
cb66f08ba5 Reconcile with jb-mr2-release - do not merge
Change-Id: I3e888cfc8bdddb707a2b06256dc7ed794e568ec4
2013-05-20 08:20:11 -07:00
The Android Automerger
277a46a5df "JWR50" 2013-05-20 05:55:38 -07:00
The Android Automerger
ca7701f0b8 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-20 05:55:06 -07:00
The Android Automerger
6290bbdae1 "JWR49" 2013-05-19 05:56:38 -07:00
The Android Automerger
cedc362ab0 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-19 05:55:08 -07:00
The Android Automerger
9f734d4ac4 JWR46C 2013-05-17 13:50:50 -07:00
repo sync
2e619b7c54 Revert "Add the sepolicy.version file to the root directory."
This reverts commit 83f646a0ef.
2013-05-17 12:57:52 -07:00
The Android Open Source Project
958e66fe18 Reconcile with jb-mr2-release - do not merge
Change-Id: Ic1c996fd98ce4f0db3bbe40a3f3fe9cb1504d3ab
2013-05-17 12:54:16 -07:00
Ying Wang
82574cb101 am 57453519: Split out proguard_basic_keeps.flags
* commit '57453519084feb13f8a2c00b6985b32427a06b5a':
  Split out proguard_basic_keeps.flags
2013-05-17 10:33:11 -07:00
Ying Wang
5745351908 Split out proguard_basic_keeps.flags
For 'LOCAL_PROGUARD_ENABLED := nosystem' we still include
proguard_basic_keeps.flags.

Change-Id: I43ee7e98d2aaeb84879441f90ab6839c0e8f4e65
2013-05-17 10:02:00 -07:00
The Android Automerger
3061af8a7e JWR46B 2013-05-16 15:21:01 -07:00
The Android Automerger
0a8805716c "JWR46" 2013-05-16 05:56:48 -07:00
The Android Automerger
01334f9b7d merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-16 05:55:20 -07:00
The Android Open Source Project
c0e9713ace Reconcile with jb-mr2-release - do not merge
Change-Id: Id8977deab29bcfaf875ff4431c398e245f61dfc5
2013-05-16 05:42:55 -07:00
The Android Automerger
f91381bd25 JWR45B 2013-05-15 16:42:18 -07:00