StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,548 Commits 1 Branch 0 Tags
116c59bbb7220c64d362d55463083b51db2f687c
Commit Graph

10548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
cbd588f064 JOO74B 2012-09-12 10:37:41 -07:00
Scott Main
7d89e1ce07 am 7832dda0: am 5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote> 
* commit '7832dda030013a10cf2c161d37025bed5433326e':
  more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
 2012-09-12 10:36:15 -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
f5cc87bae4 am 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not merge 
* commit '60573fd6083162f6a6adaa73e6978c93b76c0cb3':
  JZO54G
  JGO73
  JZO54F
  JGO72
  JGO71
  JGO70
 2012-09-12 07:50:14 -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
605c864a22 JOO74 2012-09-12 07:01:19 -07:00
The Android Automerger
1bb1f65d6a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-12 06:59:19 -07:00
The Android Automerger
a5b73475e6 JZO54G 2012-09-11 22:18:30 -07:00
Benoit Goby
bc2406e64c Add openssl to TINY_ANDROID build 
adb depends on it

Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
 2012-09-11 17:25:05 -07:00
The Android Automerger
3319f008db JOO73D 2012-09-11 16:16:50 -07:00
Scott Main
b050ed294a am 5f4e1ac6: am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev 
* commit '5f4e1ac6ee30784e458df3d90c0950595ad810a6':
  add 'small' style for long headings in Training courses
 2012-09-11 14:44:07 -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
aadbb3d3b2 am 930d2b5c: am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." 
* commit '930d2b5c3ff8727fc94609b7f9c40ef8e10a30d0':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
 2012-09-11 12:16:46 -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
7810dee7d4 JOO73C 2012-09-11 11:29:46 -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
92235190d7 JOO73B 2012-09-11 07:38:49 -07:00
The Android Automerger
11d17ed571 JOO73 2012-09-11 07:01:00 -07:00
The Android Automerger
50bafb9251 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-11 06:59:15 -07:00
The Android Automerger
818fe62cba JOO72C 2012-09-10 17:37:32 -07:00
The Android Automerger
e859020df0 JZO54F 2012-09-10 15:11:04 -07:00
The Android Automerger
accba1e68f JOO72B 2012-09-10 15:02:40 -07:00
Ying Wang
5586106944 am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '4595d7d62c0d594aa3501e4f547563348a3a5eb0':
  Add transform-d-to-p-args
 2012-09-10 10:25:41 -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
04ba21a58c JOO72 2012-09-10 07:00:36 -07:00
The Android Automerger
69331bfdb4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-10 06:59:08 -07:00
The Android Automerger
d56a49b4a1 JOO71B 2012-09-09 15:02: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
9a53a7dd41 JOO71 2012-09-09 07:03:09 -07:00
The Android Automerger
ff258acc14 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-09 06:59:39 -07:00
The Android Automerger
43093b8983 JOO68E 2012-09-08 11:59:21 -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
243b0dc136 am 65cdbdcd: am 65511c0a: fix script bug. we were running some scripts that are only used in the reference 
* commit '65cdbdcdf09f8884141b2478e1eb4d48397880d9':
  fix script bug. we were running some scripts that are only used in the reference
 2012-09-07 16:19:11 -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