summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 7039b4a7: create consistent spacing between lists and the paragraphs withi...Scott Main2012-09-181-2/+2
|\
| * create consistent spacing between lists and the paragraphs within themScott Main2012-09-181-2/+2
* | Reconcile with jb-nakasig-release - do not mergeThe Android Open Source Project2012-09-150-0/+0
|\ \
| * | JGO77The Android Automerger2012-09-151-13/+3
| * | merge in jb-nakasig-release history after reset to jb-devThe Android Automerger2012-09-150-0/+0
| |\ \ | | |/ | |/|
| | * JGO76The Android Automerger2012-09-141-13/+3
| | * merge in jb-nakasig-release history after reset to jb-devThe Android Automerger2012-09-140-0/+0
| | |\ | |/ /
* | | am a0689075: Update version number for AOSP masterJean-Baptiste Queru2012-09-141-1/+1
|\ \ \
| * | | Update version number for AOSP masterJean-Baptiste Queru2012-09-141-1/+1
* | | | Reconcile with jb-nakasig-release - do not mergeThe Android Open Source Project2012-09-130-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | JGO75The Android Automerger2012-09-131-13/+3
| * | | merge in jb-nakasig-release history after reset to jb-devThe Android Automerger2012-09-130-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | JGO74The Android Automerger2012-09-121-13/+3
| | * | merge in jb-nakasig-release history after reset to jb-devThe Android Automerger2012-09-120-0/+0
| | |\ \
* | | \ \ am 0f47a94d: am 7e300d60: Merge "Enable stack-protector for x86"Andrew Hsieh2012-09-121-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | am 7e300d60: Merge "Enable stack-protector for x86"Andrew Hsieh2012-09-121-0/+1
| |\ \ \ \
| | * \ \ \ Merge "Enable stack-protector for x86"Andrew Hsieh2012-09-121-0/+1
| | |\ \ \ \
| | | * | | | Enable stack-protector for x86Andrew Hsieh2012-08-291-0/+1
* | | | | | | am 5b5ff1a6: more specific selector for new blockquote style to fix regressio...Scott Main2012-09-121-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | more specific selector for new blockquote style to fix regressionsScott Main2012-09-121-1/+1
| | |_|_|/ / | |/| | | |
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-nakasig-release jb-mr0-release - do not mergeThe Android Open Source Project2012-09-120-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | JZO54GThe Android Automerger2012-09-111-1/+1
| | * | | | | JZO54FThe Android Automerger2012-09-101-1/+1
| * | | | | | JGO73The Android Automerger2012-09-111-13/+3
| * | | | | | merge in jb-nakasig-release history after reset to jb-devThe Android Automerger2012-09-110-0/+0
| |\ \ \ \ \ \
| | * | | | | | JGO72The Android Automerger2012-09-101-13/+3
| | * | | | | | merge in jb-nakasig-release history after reset to jb-devThe Android Automerger2012-09-100-0/+0
| | |\ \ \ \ \ \ | |/ / / / / / /
| | * | | | | | JGO71The Android Automerger2012-09-091-13/+3
| | * | | | | | merge in jb-nakasig-release history after reset to jb-devThe Android Automerger2012-09-090-0/+0
| | |\ \ \ \ \ \ | |/ / / / / / /
| | * | | | | | JGO70The Android Automerger2012-09-081-13/+3
| | * | | | | | merge in jb-nakasig-release history after reset to jb-devThe Android Automerger2012-09-080-0/+0
| | |\ \ \ \ \ \ | |/ / / / / / /
* | | | | | | | am ee7cb463: Merge "add \'small\' style for long headings in Training courses...Scott Main2012-09-111-0/+5
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "add 'small' style for long headings in Training courses" into jb-devScott Main2012-09-111-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | add 'small' style for long headings in Training coursesScott Main2012-09-111-0/+5
* | | | | | | | am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to...Ying Wang2012-09-111-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LI...Ying Wang2012-09-111-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."Ying Wang2012-09-111-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.Ying Wang2012-09-111-1/+1
| | |/ / / / / /
* | | | | | | | am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"Ying Wang2012-09-101-4/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9efa5bae: Merge "Add transform-d-to-p-args"Ying Wang2012-09-101-4/+9
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add transform-d-to-p-args"Ying Wang2012-09-101-4/+9
| | |\ \ \ \ \ \
| | | * | | | | | Add transform-d-to-p-argsYing Wang2012-09-071-4/+9
| | |/ / / / / /
* | | | | | | | am 65511c0a: fix script bug. we were running some scripts that are only used ...Scott Main2012-09-071-7/+8
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | fix script bug. we were running some scripts that are only used in the referenceScott Main2012-09-071-7/+8
| | |_|/ / / / | |/| | | | |
| | | | | | |
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
*---. \ \ \ \ \ \ Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-09-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | JRO03WThe Android Automerger2012-09-071-1/+1
| | | * | | | | JRO69The Android Automerger2012-09-071-1/+1
| | | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-09-070-0/+0
| | | |\ \ \ \ \
| | * | | | | | | JZO54EThe Android Automerger2012-09-061-1/+1
| * | | | | | | | JGO69The Android Automerger2012-09-071-13/+3