OSDN Git Service
The Android Open Source Project [Mon, 3 Jun 2013 23:43:33 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1168e923d0907bf1888bc2f894f7addfb559ca61
The Android Automerger [Mon, 3 Jun 2013 22:51:04 +0000 (15:51 -0700)]
JWR64B
The Android Open Source Project [Mon, 3 Jun 2013 21:02:22 +0000 (14:02 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ibaec6294f3598d965dba72d39859f24a76c8933b
The Android Automerger [Mon, 3 Jun 2013 12:55:38 +0000 (05:55 -0700)]
"JWR64"
The Android Automerger [Mon, 3 Jun 2013 12:55:04 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 2 Jun 2013 12:56:48 +0000 (05:56 -0700)]
"JWR63"
The Android Automerger [Sun, 2 Jun 2013 12:55:14 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 31 May 2013 20:41:15 +0000 (13:41 -0700)]
JWR60E
The Android Automerger [Fri, 31 May 2013 02:02:55 +0000 (19:02 -0700)]
JWR60D
The Android Automerger [Thu, 30 May 2013 22:26:43 +0000 (15:26 -0700)]
JWR60C
The Android Automerger [Thu, 30 May 2013 21:36:32 +0000 (14:36 -0700)]
JWR60B
Stephen Hines [Thu, 30 May 2013 21:14:29 +0000 (14:14 -0700)]
am
1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev
* commit '
1dd9f19e8f020e691f08361668a1132181c267c5':
add renderscript to support library javadocs
Stephen Hines [Thu, 30 May 2013 21:09:35 +0000 (21:09 +0000)]
Merge "add renderscript to support library javadocs" into jb-mr2-dev
The Android Open Source Project [Thu, 30 May 2013 14:31:18 +0000 (07:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iaf7449c8a3d44b7d692291a65c03ec59c2d2aedb
The Android Automerger [Thu, 30 May 2013 12:57:12 +0000 (05:57 -0700)]
"JWR60"
The Android Automerger [Thu, 30 May 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 30 May 2013 00:53:49 +0000 (17:53 -0700)]
JWR59C
The Android Automerger [Wed, 29 May 2013 22:40:24 +0000 (15:40 -0700)]
JWR59B
Kenny Root [Wed, 29 May 2013 22:26:26 +0000 (15:26 -0700)]
am
9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev
* commit '
9016d0aef415e00df636b6407a05e5e08e430ed8':
Fix signing process for SELinux file_contexts
Kenny Root [Wed, 29 May 2013 22:13:31 +0000 (22:13 +0000)]
Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev
Kenny Root [Wed, 29 May 2013 19:59:35 +0000 (12:59 -0700)]
Fix signing process for SELinux file_contexts
When not building locally and just using a target-files.zip from some
other build, it still tries to access the file_contexts from the out/
directory. This change instead looks at the unzipped target-files.zip
hierarchy to grab that information.
Bug:
9191141
Change-Id: I6ea12e82d6c6376fcada412314c5eefc97ff4853
Scott Main [Tue, 28 May 2013 21:53:22 +0000 (14:53 -0700)]
add renderscript to support library javadocs
Bug:
9188088
Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
The Android Open Source Project [Wed, 29 May 2013 15:05:48 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic2bedc28934c86a1d84c86ef081abba066b9f1e7
The Android Automerger [Wed, 29 May 2013 12:56:24 +0000 (05:56 -0700)]
"JWR59"
The Android Automerger [Wed, 29 May 2013 12:55:06 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 29 May 2013 01:15:01 +0000 (18:15 -0700)]
JWR58C
The Android Automerger [Tue, 28 May 2013 23:11:03 +0000 (16:11 -0700)]
JWR58B
The Android Open Source Project [Tue, 28 May 2013 14:37:14 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2a3754df164d9a9b56a1db167e0f10369e92efbe
The Android Automerger [Tue, 28 May 2013 12:55:19 +0000 (05:55 -0700)]
"JWR58"
The Android Automerger [Tue, 28 May 2013 12:55:03 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 27 May 2013 12:55:38 +0000 (05:55 -0700)]
"JWR57"
The Android Automerger [Mon, 27 May 2013 12:55:05 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 26 May 2013 12:56:30 +0000 (05:56 -0700)]
"JWR56"
The Android Automerger [Sun, 26 May 2013 12:55:10 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Fri, 24 May 2013 22:28:07 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I541e66a266a81d270b206ead6c8b5b67489d63ef
The Android Automerger [Fri, 24 May 2013 22:21:35 +0000 (15:21 -0700)]
JWR53F
The Android Automerger [Fri, 24 May 2013 19:23:06 +0000 (12:23 -0700)]
JWR53E
The Android Automerger [Fri, 24 May 2013 05:09:57 +0000 (22:09 -0700)]
JWR53D
The Android Automerger [Fri, 24 May 2013 02:58:17 +0000 (19:58 -0700)]
JWR53C
The Android Automerger [Thu, 23 May 2013 21:35:29 +0000 (14:35 -0700)]
JWR53B
The Android Open Source Project [Thu, 23 May 2013 15:04:40 +0000 (08:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia0eaeb088ba74ba025573ac25315bc8d426a6a5b
The Android Automerger [Thu, 23 May 2013 12:56:28 +0000 (05:56 -0700)]
"JWR53"
The Android Automerger [Thu, 23 May 2013 12:55:11 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 23 May 2013 02:10:49 +0000 (19:10 -0700)]
JWR52B
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: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 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
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 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: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
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: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:42:55 +0000 (05:42 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id8977deab29bcfaf875ff4431c398e245f61dfc5
The Android Automerger [Wed, 15 May 2013 23:42:18 +0000 (16:42 -0700)]
JWR45B
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: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: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
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: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: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
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"
OSDN Git Service
