Scott Main
dcce7ca6a8
am 582db97b: add style for code captions; ignore sidenav headers for HRs
...
* commit '582db97b23982f8e9cac7926ac3f5806b6a9cc71':
add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:54:09 -07:00
Scott Main
582db97b23
add style for code captions;
...
ignore sidenav headers for HRs
Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
2012-09-21 14:33:43 -07:00
Scott Main
5acbfcf66a
am 7039b4a7: create consistent spacing between lists and the paragraphs within them
...
* commit '7039b4a7bca269a898aacad9ddde693598ccecfc':
create consistent spacing between lists and the paragraphs within them
2012-09-18 15:40:02 -07:00
Scott Main
7039b4a7bc
create consistent spacing between lists and the paragraphs within them
...
Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
2012-09-18 11:27:59 -07:00
The Android Open Source Project
fd14e2425f
Reconcile with jb-nakasig-release - do not merge
...
Change-Id: I48d8019902c8848541677a7ddc1aa63edf74b23c
2012-09-15 08:21:27 -07:00
The Android Automerger
00e84851d1
JGO77
2012-09-15 08:09:11 -07:00
The Android Automerger
c83498786f
merge in jb-nakasig-release history after reset to jb-dev
2012-09-15 08:09:03 -07:00
The Android Automerger
a3f28386a8
JGO76
2012-09-14 08:09:16 -07:00
The Android Automerger
f56c052309
merge in jb-nakasig-release history after reset to jb-dev
2012-09-14 08:09:01 -07:00
Jean-Baptiste Queru
7916e624bd
am a0689075: Update version number for AOSP master
...
* commit 'a06890757028f7f8ae77a2c7616885a800aee15f':
Update version number for AOSP master
2012-09-14 07:45:44 -07:00
Jean-Baptiste Queru
a068907570
Update version number for AOSP master
...
Change-Id: I5bc11420932d62a2f6bc12410fe7c8ac2dca069b
2012-09-14 07:43:41 -07:00
The Android Open Source Project
fc9e3924a2
Reconcile with jb-nakasig-release - do not merge
...
Change-Id: Ic4af6ed24af4503222b6b31e87a2e45fc07cb47e
2012-09-13 11:25:29 -07:00
The Android Automerger
024057416c
JGO75
2012-09-13 08:09:21 -07:00
The Android Automerger
0fdeac4a6b
merge in jb-nakasig-release history after reset to jb-dev
2012-09-13 08:09:05 -07:00
Andrew Hsieh
3e91f5ad76
am 0f47a94d: am 7e300d60: Merge "Enable stack-protector for x86"
...
* commit '0f47a94d2eb50f30b7f559c7c7fc2a8632412cc8':
Enable stack-protector for x86
2012-09-12 14:21:07 -07:00
Andrew Hsieh
0f47a94d2e
am 7e300d60: Merge "Enable stack-protector for x86"
...
* commit '7e300d60bfc325e3cbf3e7656297c14109e513b8':
Enable stack-protector for x86
2012-09-12 14:20:11 -07:00
Andrew Hsieh
7e300d60bf
Merge "Enable stack-protector for x86"
2012-09-12 13:44:01 -07:00
Scott Main
7832dda030
am 5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
...
* commit '5b5ff1a6aeb0d12ecdf817d6ec3e585fd2c892e3':
more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
2012-09-12 10:34:15 -07:00
Scott Main
5b5ff1a6ae
more specific selector for new blockquote style to fix regressions
...
on other pages that use <blockquote>
Change-Id: Icf37f515cfe2204afb58a796222c166088d0f131
2012-09-12 10:29:45 -07:00
The Android Automerger
7da95f74c1
JGO74
2012-09-12 08:09:20 -07:00
The Android Automerger
6ae8299ba6
merge in jb-nakasig-release history after reset to jb-dev
2012-09-12 08:09:04 -07:00
The Android Open Source Project
60573fd608
Reconcile with jb-nakasig-release jb-mr0-release - do not merge
...
Change-Id: Ieff44ac588f6e8b8dd4ec52f28b94d38fbf985ca
2012-09-12 07:49:09 -07:00
The Android Automerger
a5b73475e6
JZO54G
2012-09-11 22:18:30 -07:00
Scott Main
5f4e1ac6ee
am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
...
* commit 'ee7cb4637dd257e0f9610ed87d14ab10d07bd106':
add 'small' style for long headings in Training courses
2012-09-11 14:42:43 -07:00
Scott Main
ee7cb4637d
Merge "add 'small' style for long headings in Training courses" into jb-dev
2012-09-11 14:41:28 -07:00
Scott Main
6b2dc27c08
add 'small' style for long headings in Training courses
...
Change-Id: I385df22d12ad419ad6883c0e94d3053e7e520a09
2012-09-11 14:27:34 -07:00
Ying Wang
930d2b5c3f
am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
...
* commit '6a6723a0a9c2b3c1756ce8cdf1910ade264c26ef':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
2012-09-11 12:14:34 -07:00
Ying Wang
6a6723a0a9
am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
...
* commit '4458452ef64f271906914e79ffd9923630ae22f2':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
2012-09-11 12:12:23 -07:00
Ying Wang
4458452ef6
Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
2012-09-11 11:49:11 -07:00
Ying Wang
6adcf0180a
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
...
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
2012-09-11 11:47:22 -07:00
The Android Automerger
a33e3b8390
JGO73
2012-09-11 09:54:42 -07:00
The Android Automerger
96051afe4a
merge in jb-nakasig-release history after reset to jb-dev
2012-09-11 09:54:29 -07:00
The Android Automerger
e859020df0
JZO54F
2012-09-10 15:11:04 -07:00
Ying Wang
4595d7d62c
am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"
...
* commit '410420ed667f869e15df0d3204834282984d4f6a':
Add transform-d-to-p-args
2012-09-10 10:23:29 -07:00
Ying Wang
410420ed66
am 9efa5bae: Merge "Add transform-d-to-p-args"
...
* commit '9efa5bae8645988a0d24af14142df9572bf7bd57':
Add transform-d-to-p-args
2012-09-10 10:21:57 -07:00
Ying Wang
9efa5bae86
Merge "Add transform-d-to-p-args"
2012-09-10 09:48:26 -07:00
The Android Automerger
987332e561
JGO72
2012-09-10 08:09:13 -07:00
The Android Automerger
627a73680e
merge in jb-nakasig-release history after reset to jb-dev
2012-09-10 08:09:11 -07:00
The Android Automerger
d86c56d29f
JGO71
2012-09-09 08:09:10 -07:00
The Android Automerger
0c7a9ba323
merge in jb-nakasig-release history after reset to jb-dev
2012-09-09 08:09:06 -07:00
The Android Automerger
95b1b4560b
JGO70
2012-09-08 08:09:14 -07:00
The Android Automerger
13ccbda2a2
merge in jb-nakasig-release history after reset to jb-dev
2012-09-08 08:09:05 -07:00
Ying Wang
c23f4efdbb
Add transform-d-to-p-args
...
This new indirection allows us too to output .P files when we are
generating non-.o files, such as .s or .S files.
Bug: 7127743
Change-Id: I9e46c417031764fefc9909ba4a3eb63885f34f9e
2012-09-07 17:04:06 -07:00
Scott Main
65cdbdcdf0
am 65511c0a: fix script bug. we were running some scripts that are only used in the reference
...
* commit '65511c0a726751e9973486198086d8db6a141455':
fix script bug. we were running some scripts that are only used in the reference
2012-09-07 16:17:11 -07:00
Scott Main
65511c0a72
fix script bug. we were running some scripts that are only used in the reference
...
Change-Id: I0693a7a7af5e41283942b387e53a254903b83427
2012-09-07 15:51:32 -07:00
The Android Open Source Project
a7b0ec3c48
Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
...
Change-Id: Ibb66fb1e9c4c3066c8a27139922300a511ff9e7b
2012-09-07 15:20:58 -07:00
The Android Automerger
783924163e
JRO03W
2012-09-07 10:29:09 -07:00
The Android Automerger
0527b10bc2
JRO69
2012-09-07 10:28:17 -07:00
The Android Automerger
26acee7edb
merge in jb-release history after reset to jb-dev
2012-09-07 10:28:12 -07:00
The Android Automerger
16dfdcc0c1
JGO69
2012-09-07 08:09:06 -07:00
