Commit graph

13145 commits

Author SHA1 Message Date
The Android Automerger
69a1b28ac8 JWR50B 2013-05-20 17:09:55 -07:00
Christopher Ferris
a4682460a9 Merge "Add missing adbOptions in runhat." 2013-05-20 23:47:26 +00:00
gcondra@google.com
b839579681 am cc9c2135: am 2e619b7c: Revert "Add the sepolicy.version file to the root directory."
* commit 'cc9c2135bc04489c382985270d6c5a444610b57e':
  Revert "Add the sepolicy.version file to the root directory."
2013-05-20 16:35:32 -07:00
Christopher Ferris
764b4f80fd Add missing adbOptions in runhat.
One of the adb commands in runhat was not using the adbOptions and would
fail if specifying a single serial device with multiple connected devices.

Change-Id: I804a6fccc51090cdc78dc2af76bbc0a24d843e3d
2013-05-20 16:30:10 -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
b063aac67e am 64dbf369: (-s ours) Fake version number for AOSP master - do not merge
* commit '64dbf369a864bb34c029366ff177a8239002a8ee':
  Fake version number for AOSP master - do not merge
2013-05-20 10:07:29 -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
82c2f29d14 am cb66f08b: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'cb66f08ba5dfcaf1554c8289d7f1e92e3f2f2a45':
  "JWR50"
  "JWR49"
  JWR46C
2013-05-20 08:22:44 -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
The Android Open Source Project
3705f3a3f7 am 958e66fe: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '958e66fe1803a6bf5880ad11c43825aa5a55a260':
  JWR46B
  "JWR46"
2013-05-17 12:59:41 -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
a34a0030b8 am 82574cb1: am 57453519: Split out proguard_basic_keeps.flags
* commit '82574cb101d34981bccd56513059b3d0bd3267a0':
  Split out proguard_basic_keeps.flags
2013-05-17 10:35:48 -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
35e85bdd9d am c0e9713a: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'c0e9713ace444e7627f44bbe3feb7c5ae479e834': (42 commits)
  JWR45B
  "JWR45"
  "JWR44B"
  "JWR44"
  "JWR43"
  JWR39D
  JWR39C
  JWR39B
  "JWR39"
  JWR38B
  "JWR38"
  "JWR37"
  JWR36C
  JWR36B
  "JWR36"
  JWR32E
  JWR32D
  JWR32C
  JWR32B
  "JWR32"
  ...
2013-05-16 05:48:13 -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
Rom Lemarchand
88249ced78 Merge "core: combo: arm: add cortex-a8 target" 2013-05-16 03:15:55 +00:00
The Android Automerger
f91381bd25 JWR45B 2013-05-15 16:42:18 -07:00
gcondra@google.com
8f8e35d7dd am 809b537e: am 046ed25f: Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
* commit '809b537e4a9fa7007bb455a630f999514f0f0cee':
  Add the sepolicy.version file to the root directory.
2013-05-15 13:37:24 -07:00
gcondra@google.com
809b537e4a am 046ed25f: Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
* commit '046ed25f5212a3778868c28ad6695fb6f8ce26d2':
  Add the sepolicy.version file to the root directory.
2013-05-15 13:34:48 -07:00
repo sync
046ed25f52 Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev 2013-05-15 17:31:01 +00:00
The Android Automerger
ef95aa7087 "JWR45" 2013-05-15 05:56:33 -07:00
The Android Automerger
2d4daa8bb9 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-15 05:55:12 -07:00
Dirk Dougherty
a7eeb5d4fe am 10e6d807: am f7787853: am 246089b1: am 87ef69ef: am 686f55a5: am 5b146f22: am e5862e8a: Doc change: css for distribute links.
* commit '10e6d8071d6184adab072ee40fc41fb3c70faefe':
  Doc change: css for distribute links.
2013-05-15 05:36:07 -07:00
Dirk Dougherty
10e6d8071d am f7787853: am 246089b1: am 87ef69ef: am 686f55a5: am 5b146f22: am e5862e8a: Doc change: css for distribute links.
* commit 'f7787853ff25d8325901ca4e0af0adfce278d8f5':
  Doc change: css for distribute links.
2013-05-15 05:33:56 -07:00
Dirk Dougherty
f7787853ff am 246089b1: am 87ef69ef: am 686f55a5: am 5b146f22: am e5862e8a: Doc change: css for distribute links.
* commit '246089b15a168ff6e632b23b24f2904faa90fd1b':
  Doc change: css for distribute links.
2013-05-15 05:32:02 -07:00
Dirk Dougherty
246089b15a am 87ef69ef: am 686f55a5: am 5b146f22: am e5862e8a: Doc change: css for distribute links.
* commit '87ef69eff92c56b13532e1732e9950c6497e7eca':
  Doc change: css for distribute links.
2013-05-15 05:28:09 -07:00
Dirk Dougherty
87ef69eff9 am 686f55a5: am 5b146f22: am e5862e8a: Doc change: css for distribute links.
* commit '686f55a596f3abcb17184e6005fbd3d5691b9dbb':
  Doc change: css for distribute links.
2013-05-15 04:29:44 -07:00
Dirk Dougherty
686f55a596 am 5b146f22: am e5862e8a: Doc change: css for distribute links.
* commit '5b146f227a3dfaa62b8e40f3a2b7a21991c09a4a':
  Doc change: css for distribute links.
2013-05-15 04:25:47 -07:00
Dirk Dougherty
5b146f227a am e5862e8a: Doc change: css for distribute links.
* commit 'e5862e8a1e92fc8d569600b8c61866d86c3872f0':
  Doc change: css for distribute links.
2013-05-15 04:20:58 -07:00
Dirk Dougherty
e5862e8a1e Doc change: css for distribute links.
Change-Id: Ifc74ea3f6099484b9c7549f8e8684dda4aeaf96f
2013-05-15 02:20:53 -07:00
Scott Main
b341ee3a43 am b5a45aae: am 054ad87b: am 34198387: am 216c09a0: am 382b121c: am 3d2121f0: am 0b2db169: add \'go-link\' style for "next" style arrows w/o the javascript effects
* commit 'b5a45aaee9e6d344914752bc48666111956a4fff':
  add 'go-link' style for "next" style arrows w/o the javascript effects
2013-05-15 01:33:34 -07:00
Scott Main
b5a45aaee9 am 054ad87b: am 34198387: am 216c09a0: am 382b121c: am 3d2121f0: am 0b2db169: add \'go-link\' style for "next" style arrows w/o the javascript effects
* commit '054ad87bb569edcf9729ec23fe52d0cc84285550':
  add 'go-link' style for "next" style arrows w/o the javascript effects
2013-05-15 01:32:16 -07:00
Scott Main
054ad87bb5 am 34198387: am 216c09a0: am 382b121c: am 3d2121f0: am 0b2db169: add \'go-link\' style for "next" style arrows w/o the javascript effects
* commit '34198387201affd9409ad78a918c988e6a92036c':
  add 'go-link' style for "next" style arrows w/o the javascript effects
2013-05-15 01:31:21 -07:00
Scott Main
3419838720 am 216c09a0: am 382b121c: am 3d2121f0: am 0b2db169: add \'go-link\' style for "next" style arrows w/o the javascript effects
* commit '216c09a0787498960be53a3e6bb185d4982e3466':
  add 'go-link' style for "next" style arrows w/o the javascript effects
2013-05-15 01:29:01 -07:00
Scott Main
216c09a078 am 382b121c: am 3d2121f0: am 0b2db169: add \'go-link\' style for "next" style arrows w/o the javascript effects
* commit '382b121c0c65758d33690f79eb97fca727bdfcb5':
  add 'go-link' style for "next" style arrows w/o the javascript effects
2013-05-15 01:26:59 -07:00
Scott Main
382b121c0c am 3d2121f0: am 0b2db169: add \'go-link\' style for "next" style arrows w/o the javascript effects
* commit '3d2121f0c951c6e6b621bd892da5836f005f00e1':
  add 'go-link' style for "next" style arrows w/o the javascript effects
2013-05-15 01:25:00 -07:00
Scott Main
3d2121f0c9 am 0b2db169: add \'go-link\' style for "next" style arrows w/o the javascript effects
* commit '0b2db169cb2530ff39d7fa3c591f5fdd93a81dd6':
  add 'go-link' style for "next" style arrows w/o the javascript effects
2013-05-15 01:23:53 -07:00
Scott Main
0b2db169cb add 'go-link' style for "next" style arrows w/o the javascript effects
Change-Id: I2950579b2657bdacfe038790668959d607a60277
2013-05-15 01:15:50 -07:00
Rom Lemarchand
8805930b6f core: combo: arm: add cortex-a8 target
Change-Id: I83e409dd048762acbd2e2dec9b0095933141cff0
2013-05-14 20:16:16 -07:00