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 |
|
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
|
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
|
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 |
|
The Android Automerger
|
490f39dff1
|
"JWR44B"
|
2013-05-14 12:58:47 -07:00 |
|
The Android Automerger
|
1a49b1dedf
|
merge in jb-mr2-release history after reset to jb-mr2-dev
|
2013-05-14 12:57:51 -07:00 |
|
Tim Murray
|
5861448a2d
|
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.
|
2013-05-14 12:46:08 -07:00 |
|
Tim Murray
|
205aaf16e7
|
Merge "Don't build librs.*.so in bundled branches since we'll use native RS." into jb-mr2-dev
|
2013-05-14 19:42:53 +00:00 |
|
Scott Main
|
66329cb95f
|
am ae2394a8: am 7a36c073: am 50eb3c47: am 9bfcd733: adjustments to developer notice style
* commit 'ae2394a85f4bd4d68e75c891a76981d14977daf7':
adjustments to developer notice style
|
2013-05-14 11:11:16 -07:00 |
|
Scott Main
|
ae2394a85f
|
am 7a36c073: am 50eb3c47: am 9bfcd733: adjustments to developer notice style
* commit '7a36c07308e8883023186bf2165ea675bf183969':
adjustments to developer notice style
|
2013-05-14 11:08:18 -07:00 |
|
Scott Main
|
7a36c07308
|
am 50eb3c47: am 9bfcd733: adjustments to developer notice style
* commit '50eb3c47def75cffefe5ed2ef2d442a196ed6a14':
adjustments to developer notice style
|
2013-05-14 11:06:50 -07:00 |
|
Scott Main
|
50eb3c47de
|
am 9bfcd733: adjustments to developer notice style
* commit '9bfcd733cf13aa837c41c7c48cbfa7b612e79665':
adjustments to developer notice style
|
2013-05-14 11:05:03 -07:00 |
|
Scott Main
|
9bfcd733cf
|
adjustments to developer notice style
Change-Id: Id5ffd85524afc79c005dc3884e442e777fe54b5f
|
2013-05-14 09:33:19 -07:00 |
|
The Android Automerger
|
3226bb7276
|
"JWR44"
|
2013-05-14 05:56:30 -07:00 |
|
The Android Automerger
|
0dec4c694d
|
merge in jb-mr2-release history after reset to jb-mr2-dev
|
2013-05-14 05:55:09 -07:00 |
|
Scott Main
|
171ac91488
|
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
|
2013-05-13 23:34:37 -07:00 |
|
Scott Main
|
8234604834
|
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
|
2013-05-13 23:30:24 -07:00 |
|
Scott Main
|
5ea9ac1696
|
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
|
2013-05-13 23:28:16 -07:00 |
|
Scott Main
|
85739fc5e4
|
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
|
2013-05-13 23:26:44 -07:00 |
|
Scott Main
|
e1b9d41f0b
|
Merge "add styles for crosslink from design to develop docs" into jb-mr1.1-ub-dev
|
2013-05-14 01:54:48 +00:00 |
|
Scott Main
|
d2af6d2284
|
add styles for crosslink from design to develop docs
Change-Id: Ia6ad4f03cec5a26fd9b7585be05f46efa2eeca7e
|
2013-05-13 18:47:03 -07:00 |
|
Tim Murray
|
8e0567ae77
|
Don't build librs.*.so in bundled branches since we'll use native RS.
bug 8939828
Change-Id: I3f991ad7b6b1590063a9048326fd95edc483af13
|
2013-05-13 15:46:37 -07:00 |
|
repo sync
|
83f646a0ef
|
Add the sepolicy.version file to the root directory.
Bug: 8841348
Change-Id: I9b4b096eb11b332a4c2c3cb8df179cf611a7ff43
|
2013-05-13 13:21:23 -07:00 |
|
The Android Automerger
|
b84a270ce2
|
"JWR43"
|
2013-05-13 05:57:01 -07:00 |
|