OSDN Git Service
Brian Carlstrom [Wed, 8 May 2013 18:03:26 +0000 (11:03 -0700)]
Add WITH_ART
(cherry picked from commit
6b7a0d2f1ff90d24e3ade9ccf82a084f5f999c1f)
Change-Id: If6e208f9fc859f31da2cd71fdc1ddbe1fc1ed7aa
The Android Open Source Project [Wed, 22 May 2013 14:24:08 +0000 (07:24 -0700)]
am
ab9fd481: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
ab9fd481634f7b32ad9d697fc6a57212c1fbf039':
"JWR52"
JWR51B
The Android Open Source Project [Wed, 22 May 2013 14:22:42 +0000 (07:22 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id47cc82d638cc12e7db5abf7e9f6a0a164e551f3
The Android Automerger [Wed, 22 May 2013 12:56:16 +0000 (05:56 -0700)]
"JWR52"
The Android Automerger [Wed, 22 May 2013 12:55:08 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 22 May 2013 00:18:17 +0000 (17:18 -0700)]
JWR51B
Ying Wang [Tue, 21 May 2013 19:31:57 +0000 (12:31 -0700)]
am
210aee35: am
fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
* commit '
210aee35a9dec3b94ab0cfc247e6c89c1e387f19':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
Ying Wang [Tue, 21 May 2013 19:25:39 +0000 (12:25 -0700)]
am
fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
* commit '
fa29872ae08408f90e1282bff36a0bdba13d0fdc':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
Ying Wang [Tue, 21 May 2013 18:33:31 +0000 (18:33 +0000)]
Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
The Android Open Source Project [Tue, 21 May 2013 16:02:32 +0000 (09:02 -0700)]
am
fd5b59fe: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
fd5b59feba63a695977169e4f3fee3133af97c1e':
"JWR51"
JWR50B
The Android Open Source Project [Tue, 21 May 2013 15:58:48 +0000 (08:58 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I5ea4651068ddbac4e42244bd638b8cce98f03be2
The Android Automerger [Tue, 21 May 2013 14:47:57 +0000 (07:47 -0700)]
"JWR51"
The Android Automerger [Tue, 21 May 2013 14:46:33 +0000 (07:46 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 21 May 2013 00:09:55 +0000 (17:09 -0700)]
JWR50B
Christopher Ferris [Mon, 20 May 2013 23:47:26 +0000 (23:47 +0000)]
Merge "Add missing adbOptions in runhat."
gcondra@google.com [Mon, 20 May 2013 23:35:32 +0000 (16:35 -0700)]
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."
Christopher Ferris [Mon, 20 May 2013 23:30:10 +0000 (16:30 -0700)]
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
gcondra@google.com [Mon, 20 May 2013 22:52:26 +0000 (15:52 -0700)]
am
2e619b7c: Revert "Add the sepolicy.version file to the root directory."
* commit '
2e619b7c5458cb3b381bd8a02076f549dba8d045':
Revert "Add the sepolicy.version file to the root directory."
Pete Delaney [Mon, 20 May 2013 22:27:20 +0000 (15:27 -0700)]
[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>
Jean-Baptiste Queru [Mon, 20 May 2013 17:07:29 +0000 (10:07 -0700)]
am
64dbf369: (-s ours) Fake version number for AOSP master - do not merge
* commit '
64dbf369a864bb34c029366ff177a8239002a8ee':
Fake version number for AOSP master - do not merge
Jean-Baptiste Queru [Mon, 20 May 2013 16:50:39 +0000 (09:50 -0700)]
Fake version number for AOSP master - do not merge
Change-Id: Ib605660f5baabf791bbbefb5d73dbe90e85ad51d
The Android Open Source Project [Mon, 20 May 2013 15:22:44 +0000 (08:22 -0700)]
am
cb66f08b: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
cb66f08ba5dfcaf1554c8289d7f1e92e3f2f2a45':
"JWR50"
"JWR49"
JWR46C
The Android Open Source Project [Mon, 20 May 2013 15:20:11 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I3e888cfc8bdddb707a2b06256dc7ed794e568ec4
The Android Automerger [Mon, 20 May 2013 12:55:38 +0000 (05:55 -0700)]
"JWR50"
The Android Automerger [Mon, 20 May 2013 12:55:06 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 19 May 2013 12:56:38 +0000 (05:56 -0700)]
"JWR49"
The Android Automerger [Sun, 19 May 2013 12:55:08 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 17 May 2013 20:50:50 +0000 (13:50 -0700)]
JWR46C
The Android Open Source Project [Fri, 17 May 2013 19:59:41 +0000 (12:59 -0700)]
am
958e66fe: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
958e66fe1803a6bf5880ad11c43825aa5a55a260':
JWR46B
"JWR46"
repo sync [Fri, 17 May 2013 19:57:52 +0000 (12:57 -0700)]
Revert "Add the sepolicy.version file to the root directory."
This reverts commit
83f646a0efdf69d84d3eb828eec74ec3881074f2.
The Android Open Source Project [Fri, 17 May 2013 19:54:16 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic1c996fd98ce4f0db3bbe40a3f3fe9cb1504d3ab
Ying Wang [Fri, 17 May 2013 17:35:48 +0000 (10:35 -0700)]
am
82574cb1: am
57453519: Split out proguard_basic_keeps.flags
* commit '
82574cb101d34981bccd56513059b3d0bd3267a0':
Split out proguard_basic_keeps.flags
Ying Wang [Fri, 17 May 2013 17:33:11 +0000 (10:33 -0700)]
am
57453519: Split out proguard_basic_keeps.flags
* commit '
57453519084feb13f8a2c00b6985b32427a06b5a':
Split out proguard_basic_keeps.flags
Ying Wang [Fri, 17 May 2013 17:02:00 +0000 (10:02 -0700)]
Split out proguard_basic_keeps.flags
For 'LOCAL_PROGUARD_ENABLED := nosystem' we still include
proguard_basic_keeps.flags.
Change-Id: I43ee7e98d2aaeb84879441f90ab6839c0e8f4e65
The Android Automerger [Thu, 16 May 2013 22:21:01 +0000 (15:21 -0700)]
JWR46B
The Android Automerger [Thu, 16 May 2013 12:56:48 +0000 (05:56 -0700)]
"JWR46"
The Android Automerger [Thu, 16 May 2013 12:55:20 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 16 May 2013 12:48:13 +0000 (05:48 -0700)]
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"
...
The Android Open Source Project [Thu, 16 May 2013 12:42:55 +0000 (05:42 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id8977deab29bcfaf875ff4431c398e245f61dfc5
Rom Lemarchand [Thu, 16 May 2013 03:15:55 +0000 (03:15 +0000)]
Merge "core: combo: arm: add cortex-a8 target"
The Android Automerger [Wed, 15 May 2013 23:42:18 +0000 (16:42 -0700)]
JWR45B
gcondra@google.com [Wed, 15 May 2013 20:37:24 +0000 (13:37 -0700)]
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.
gcondra@google.com [Wed, 15 May 2013 20:34:48 +0000 (13:34 -0700)]
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.
repo sync [Wed, 15 May 2013 17:31:01 +0000 (17:31 +0000)]
Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
The Android Automerger [Wed, 15 May 2013 12:56:33 +0000 (05:56 -0700)]
"JWR45"
The Android Automerger [Wed, 15 May 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Dirk Dougherty [Wed, 15 May 2013 12:36:07 +0000 (05:36 -0700)]
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.
Dirk Dougherty [Wed, 15 May 2013 12:33:56 +0000 (05:33 -0700)]
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.
Dirk Dougherty [Wed, 15 May 2013 12:32:02 +0000 (05:32 -0700)]
am
246089b1: am
87ef69ef: am
686f55a5: am
5b146f22: am
e5862e8a: Doc change: css for distribute links.
* commit '
246089b15a168ff6e632b23b24f2904faa90fd1b':
Doc change: css for distribute links.
Dirk Dougherty [Wed, 15 May 2013 12:28:09 +0000 (05:28 -0700)]
am
87ef69ef: am
686f55a5: am
5b146f22: am
e5862e8a: Doc change: css for distribute links.
* commit '
87ef69eff92c56b13532e1732e9950c6497e7eca':
Doc change: css for distribute links.
Dirk Dougherty [Wed, 15 May 2013 11:29:44 +0000 (04:29 -0700)]
am
686f55a5: am
5b146f22: am
e5862e8a: Doc change: css for distribute links.
* commit '
686f55a596f3abcb17184e6005fbd3d5691b9dbb':
Doc change: css for distribute links.
Dirk Dougherty [Wed, 15 May 2013 11:25:47 +0000 (04:25 -0700)]
am
5b146f22: am
e5862e8a: Doc change: css for distribute links.
* commit '
5b146f227a3dfaa62b8e40f3a2b7a21991c09a4a':
Doc change: css for distribute links.
Dirk Dougherty [Wed, 15 May 2013 11:20:58 +0000 (04:20 -0700)]
am
e5862e8a: Doc change: css for distribute links.
* commit '
e5862e8a1e92fc8d569600b8c61866d86c3872f0':
Doc change: css for distribute links.
Dirk Dougherty [Wed, 15 May 2013 09:19:54 +0000 (02:19 -0700)]
Doc change: css for distribute links.
Change-Id: Ifc74ea3f6099484b9c7549f8e8684dda4aeaf96f
Scott Main [Wed, 15 May 2013 08:33:34 +0000 (01:33 -0700)]
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
Scott Main [Wed, 15 May 2013 08:32:16 +0000 (01:32 -0700)]
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
Scott Main [Wed, 15 May 2013 08:31:21 +0000 (01:31 -0700)]
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
Scott Main [Wed, 15 May 2013 08:29:01 +0000 (01:29 -0700)]
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
Scott Main [Wed, 15 May 2013 08:26:59 +0000 (01:26 -0700)]
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
Scott Main [Wed, 15 May 2013 08:25:00 +0000 (01:25 -0700)]
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
Scott Main [Wed, 15 May 2013 08:23:53 +0000 (01:23 -0700)]
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
Scott Main [Wed, 15 May 2013 08:15:50 +0000 (01:15 -0700)]
add 'go-link' style for "next" style arrows w/o the javascript effects
Change-Id: I2950579b2657bdacfe038790668959d607a60277
Rom Lemarchand [Fri, 3 May 2013 12:41:01 +0000 (05:41 -0700)]
core: combo: arm: add cortex-a8 target
Change-Id: I83e409dd048762acbd2e2dec9b0095933141cff0
Brian Carlstrom [Tue, 14 May 2013 20:42:53 +0000 (20:42 +0000)]
Merge "add a fake data target."
The Android Automerger [Tue, 14 May 2013 19:58:47 +0000 (12:58 -0700)]
"JWR44B"
The Android Automerger [Tue, 14 May 2013 19:57:51 +0000 (12:57 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Tim Murray [Tue, 14 May 2013 19:49:22 +0000 (12:49 -0700)]
am
5861448a: am
205aaf16: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev
* commit '
5861448a2d85cbfdc814621095889978060dd0de':
Don't build librs.*.so in bundled branches since we'll use native RS.
Tim Murray [Tue, 14 May 2013 19:46:08 +0000 (12:46 -0700)]
am
205aaf16: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev
* commit '
205aaf16e77edbdb4ea4a2f2edcc6d6a6b6f9c4c':
Don't build librs.*.so in bundled branches since we'll use native RS.
Tim Murray [Tue, 14 May 2013 19:42:53 +0000 (19:42 +0000)]
Merge "Don't build librs.*.so in bundled branches since we'll use native RS." into jb-mr2-dev
Scott Main [Tue, 14 May 2013 18:13:40 +0000 (11:13 -0700)]
am
66329cb9: am
ae2394a8: am
7a36c073: am
50eb3c47: am
9bfcd733: adjustments to developer notice style
* commit '
66329cb95ff45fb8dddefef810a2b508fa5022f5':
adjustments to developer notice style
Scott Main [Tue, 14 May 2013 18:11:16 +0000 (11:11 -0700)]
am
ae2394a8: am
7a36c073: am
50eb3c47: am
9bfcd733: adjustments to developer notice style
* commit '
ae2394a85f4bd4d68e75c891a76981d14977daf7':
adjustments to developer notice style
Scott Main [Tue, 14 May 2013 18:08:18 +0000 (11:08 -0700)]
am
7a36c073: am
50eb3c47: am
9bfcd733: adjustments to developer notice style
* commit '
7a36c07308e8883023186bf2165ea675bf183969':
adjustments to developer notice style
Scott Main [Tue, 14 May 2013 18:06:50 +0000 (11:06 -0700)]
am
50eb3c47: am
9bfcd733: adjustments to developer notice style
* commit '
50eb3c47def75cffefe5ed2ef2d442a196ed6a14':
adjustments to developer notice style
Scott Main [Tue, 14 May 2013 18:05:03 +0000 (11:05 -0700)]
am
9bfcd733: adjustments to developer notice style
* commit '
9bfcd733cf13aa837c41c7c48cbfa7b612e79665':
adjustments to developer notice style
Tsu Chiang Chuang [Fri, 13 Jul 2012 20:47:09 +0000 (13:47 -0700)]
add a fake data target.
(cherry picked from commit
3ba7baf14875d3cd360006be7dffe7e4e0cf1882)
Change-Id: I691d4dda65437d3f57e77ed207da406fd1f53355
Scott Main [Tue, 14 May 2013 16:14:35 +0000 (09:14 -0700)]
adjustments to developer notice style
Change-Id: Id5ffd85524afc79c005dc3884e442e777fe54b5f
The Android Automerger [Tue, 14 May 2013 12:56:30 +0000 (05:56 -0700)]
"JWR44"
The Android Automerger [Tue, 14 May 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Scott Main [Tue, 14 May 2013 06:39:09 +0000 (23:39 -0700)]
am
171ac914: am
82346048: am
5ea9ac16: am
85739fc5: am
e1b9d41f: Merge "add styles for crosslink from design to develop docs" into jb-mr1.1-ub-dev
* commit '
171ac914888d937b8f7b04366fb2b80cf8dfd393':
add styles for crosslink from design to develop docs
Scott Main [Tue, 14 May 2013 06:34:37 +0000 (23:34 -0700)]
am
82346048: am
5ea9ac16: am
85739fc5: am
e1b9d41f: Merge "add styles for crosslink from design to develop docs" into jb-mr1.1-ub-dev
* commit '
8234604834233de2883fffbd6567c102611fa8d2':
add styles for crosslink from design to develop docs
Scott Main [Tue, 14 May 2013 06:30:24 +0000 (23:30 -0700)]
am
5ea9ac16: am
85739fc5: am
e1b9d41f: Merge "add styles for crosslink from design to develop docs" into jb-mr1.1-ub-dev
* commit '
5ea9ac1696bc2e92f037eda9bd27492bfcf0af50':
add styles for crosslink from design to develop docs
Scott Main [Tue, 14 May 2013 06:28:16 +0000 (23:28 -0700)]
am
85739fc5: am
e1b9d41f: Merge "add styles for crosslink from design to develop docs" into jb-mr1.1-ub-dev
* commit '
85739fc5e4d8fff0b082befe89f9a0e96098f178':
add styles for crosslink from design to develop docs
Scott Main [Tue, 14 May 2013 06:26:44 +0000 (23:26 -0700)]
am
e1b9d41f: Merge "add styles for crosslink from design to develop docs" into jb-mr1.1-ub-dev
* commit '
e1b9d41f0b37eba6ad7e13381e648d2b00e80962':
add styles for crosslink from design to develop docs
Scott Main [Tue, 14 May 2013 01:54:48 +0000 (01:54 +0000)]
Merge "add styles for crosslink from design to develop docs" into jb-mr1.1-ub-dev
Scott Main [Tue, 14 May 2013 01:39:06 +0000 (18:39 -0700)]
add styles for crosslink from design to develop docs
Change-Id: Ia6ad4f03cec5a26fd9b7585be05f46efa2eeca7e
Tim Murray [Mon, 13 May 2013 22:46:37 +0000 (15:46 -0700)]
Don't build librs.*.so in bundled branches since we'll use native RS.
bug
8939828
Change-Id: I3f991ad7b6b1590063a9048326fd95edc483af13
repo sync [Fri, 10 May 2013 08:23:22 +0000 (01:23 -0700)]
Add the sepolicy.version file to the root directory.
Bug:
8841348
Change-Id: I9b4b096eb11b332a4c2c3cb8df179cf611a7ff43
The Android Automerger [Mon, 13 May 2013 12:57:01 +0000 (05:57 -0700)]
"JWR43"
The Android Automerger [Mon, 13 May 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 10 May 2013 19:09:32 +0000 (12:09 -0700)]
JWR39D
The Android Automerger [Thu, 9 May 2013 23:02:50 +0000 (16:02 -0700)]
JWR39C
The Android Automerger [Thu, 9 May 2013 20:01:23 +0000 (13:01 -0700)]
JWR39B
The Android Automerger [Thu, 9 May 2013 12:56:33 +0000 (05:56 -0700)]
"JWR39"
The Android Automerger [Thu, 9 May 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Thu, 9 May 2013 00:00:20 +0000 (00:00 +0000)]
Merge "Install to TARGET_OUT_APPS_PRIVILEGED if LOCAL_PRIVILEGED_MODULE is true"
Robert Ly [Wed, 8 May 2013 23:25:30 +0000 (16:25 -0700)]
Robert Ly [Wed, 8 May 2013 23:23:02 +0000 (16:23 -0700)]
Robert Ly [Wed, 8 May 2013 23:21:03 +0000 (16:21 -0700)]
Robert Ly [Wed, 8 May 2013 23:19:08 +0000 (16:19 -0700)]
Robert Ly [Wed, 8 May 2013 23:17:07 +0000 (16:17 -0700)]
OSDN Git Service
