OSDN Git Service
(root)
/
android-x86
/
build.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge in klp-mr1-release history after reset to klp-dev
[android-x86/build.git]
/
tools
/
merge-event-log-tags.py
2012-11-15
Scott Main
am 9efb6b09: am be264b6d: am 5a1123ef: add script to...
blob
|
commitdiff
2012-11-13
Scott Main
am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle...
blob
|
commitdiff
2012-11-12
Ying Wang
am 865d851a: Merge "Remove the obsolete comments and...
blob
|
commitdiff
2012-11-12
Andrew Hsieh
resolved conflicts for merge of 8b3ce5a3 to stage-aosp...
blob
|
commitdiff
2012-11-09
Andrew Hsieh
am 2ea957a3: Merge "Revise checks for MacOSX to build...
blob
|
commitdiff
2012-11-08
Elliott Hughes
am ef9744f7: Merge "Remove manual WITH_JIT setting...
blob
|
commitdiff
2012-11-02
Robert Ly
am 0900e42e: am 12e6b988: am e896e344: Merge "add css...
blob
|
commitdiff
2012-10-30
Ying Wang
am a281e6a9: Merge "Filter out the overridden packages...
blob
|
commitdiff
2012-10-26
Ying Wang
am 0d211eb9: Merge "Split to multiple bash commands."
blob
|
commitdiff
2012-10-25
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
2012-10-25
Scott Main
am 4810a244: am 71e20e2e: am ef4d1081: Merge "update...
blob
|
commitdiff
2012-10-24
Dirk Dougherty
am 80ebbc3c: am 1a13c317: am a4375a19: Merge "Doc chang...
blob
|
commitdiff
2012-10-24
Andrew Hsieh
am 7176e801: Merge "Add TARGET_GCC_VERSION"
blob
|
commitdiff
2012-10-23
Scott Main
am ab84504b: am 6613a232: am 0e585706: fix spacing...
blob
|
commitdiff
2012-10-22
Nick Kralevich
am d883749e: Merge "x86: add --warn-shared-textrel"
blob
|
commitdiff
2012-10-18
Elliott Hughes
am 1a36c59e: Merge "Remove tzdata from core.mk, now...
blob
|
commitdiff
2012-10-18
Elliott Hughes
am 83e024c0: Merge "Add new tzdata and tzdata-host...
blob
|
commitdiff
2012-10-17
Kenny Root
am 2e0d1af7: Merge changes I58d43128,Ie34c958f
blob
|
commitdiff
2012-10-11
Dirk Dougherty
am 77b10b6a: am e37b7a52: am 8f20607c: Doc change:...
blob
|
commitdiff
2012-10-08
Scott Main
am b282c359: am 126c5e92: am e6850d2d: fix layout bug...
blob
|
commitdiff
2012-10-05
Jean-Baptiste Queru
am 4bf886ad: (-s ours) am b8c037ba: Merge "Add BOARD_CU...
blob
|
commitdiff
2012-10-05
Nick Kralevich
am f3b02739: am 7653519f: Merge "[MIPS] Makes a build...
blob
|
commitdiff
2012-10-04
Scott Main
am ded6dc01: am 86028756: am 46c5804c: add analytics...
blob
|
commitdiff
2012-10-03
Jean-Baptiste Queru
am 2cb0549a: Reconcile with jb-dev
blob
|
commitdiff
2012-10-03
Elliott Hughes
resolved conflicts for merge of 01b2aaaa to jb-mr1...
blob
|
commitdiff
2012-10-03
Scott Main
am 55b19bdd: am 9341d398: am a4888dc8: adjust position...
blob
|
commitdiff
2012-10-03
Scott Main
am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (...
blob
|
commitdiff
2012-10-03
Scott Main
am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (...
blob
|
commitdiff
2012-10-03
Scott Main
am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (...
blob
|
commitdiff
2012-10-03
Scott Main
am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (...
blob
|
commitdiff
2012-10-03
Scott Main
am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (...
blob
|
commitdiff
2012-10-03
Scott Main
am 2452b062: am 0c81a130: provide more width for button...
blob
|
commitdiff
2012-10-03
Scott Main
am b649b416: am 235f4d4f: refactor the logic for changi...
blob
|
commitdiff
2012-10-02
Conley Owens
am 672b1893: am 8c37f49f: Merge "Follow symlinks when...
blob
|
commitdiff
2012-10-02
Scott Main
am 74811834: am dd3d3eea: add localize langs for global...
blob
|
commitdiff
2012-10-02
The Android Open...
am a6c77d92: (-s ours) Reconcile with jb-mr0-release...
blob
|
commitdiff
2012-09-28
The Android Open...
am 91f71ca3: (-s ours) Reconcile with jb-mr0-release...
blob
|
commitdiff
2012-09-26
The Android Open...
am a8a731bf: (-s ours) Reconcile with jb-mr0-release...
blob
|
commitdiff
2012-09-24
The Android Open...
am d50926a0: (-s ours) Reconcile with jb-mr0-release...
blob
|
commitdiff
2012-09-21
Scott Main
am dcce7ca6: am 582db97b: add style for code captions...
blob
|
commitdiff
2012-09-21
The Android Automerger
merge in jb-mr1-release history after reset to jb-mr1-dev
blob
|
commitdiff
2012-09-20
Zhihai Xu
Merge "ISSUE 6849488 Bluedroid stack, remove system...
blob
|
commitdiff
2012-09-20
Ying Wang
Merge "Move AndroidConfig.h from system/core to the...
blob
|
commitdiff
2012-09-20
Doug Zongker
am 85c118b1: am c4d68391: Merge "fix merge-event-log...
blob
|
commitdiff
2012-09-20
Doug Zongker
am c4d68391: Merge "fix merge-event-log-tags.py depreca...
blob
|
commitdiff
2012-09-20
Doug Zongker
am c4d68391: Merge "fix merge-event-log-tags.py depreca...
blob
|
commitdiff
2012-09-20
Doug Zongker
Merge "fix merge-event-log-tags.py deprecation warning...
blob
|
commitdiff
2012-09-20
Doug Zongker
fix merge-event-log-tags.py deprecation warning
blob
|
commitdiff
2010-12-06
Jean-Baptiste Queru
am 4985f06f: Merge "Make image-size-from-data-size...
blob
|
commitdiff
|
diff to current
2010-11-24
Jean-Baptiste Queru
am d2dd8652: Merge "Added generic hook for loading...
blob
|
commitdiff
|
diff to current
2010-11-23
Jean-Baptiste Queru
am 7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_...
blob
|
commitdiff
|
diff to current
2010-11-19
Jean-Baptiste Queru
resolved conflicts for merge of b2028868 to gingerbread...
blob
|
commitdiff
|
diff to current
2010-11-19
Jean-Baptiste Queru
am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that...
blob
|
commitdiff
|
diff to current
2010-11-19
Jean-Baptiste Queru
resolved conflicts for merge of 4130c80a to gingerbread...
blob
|
commitdiff
|
diff to current
2010-11-19
Jean-Baptiste Queru
am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
blob
|
commitdiff
|
diff to current
2010-11-19
Ying Wang
am b26a65b5: Merge "Restrict make version to 3.81"
blob
|
commitdiff
|
diff to current
2010-11-17
Jean-Baptiste Queru
am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_...
blob
|
commitdiff
|
diff to current
2010-11-11
Xavier Ducrohet
am 01a9840b: Merge "Rename layoutlib_utils into ide_common"
blob
|
commitdiff
|
diff to current
2010-11-04
Jean-Baptiste Queru
Merge 7b393fd1 from open-source master
blob
|
commitdiff
|
diff to current
2010-11-02
Jean-Baptiste Queru
am 892ea1ea: Merge "build: Add spare size flag to mkyaf...
blob
|
commitdiff
|
diff to current
2010-10-30
Raphael Moll
am 4aa7a190: Merge "Fix "make acp" under Cygwin. DO...
blob
|
commitdiff
|
diff to current
2010-10-29
Jean-Baptiste Queru
am 16bf5290: (-s ours) Merge from AOSP froyo. Do not...
blob
|
commitdiff
|
diff to current
2010-10-19
Jean-Baptiste Queru
resolved conflicts for merge of 54ddcc27 to gingerbread...
blob
|
commitdiff
|
diff to current
2010-10-11
Bill Napier
am fcab8402: Merge "Add in MonkeyRunner target (and...
blob
|
commitdiff
|
diff to current
2010-10-07
Jean-Baptiste Queru
resolved conflicts for merge of 0f085e5a to gingerbread...
blob
|
commitdiff
|
diff to current
2010-10-07
Brian Muramatsu
resolved conflicts for merge of 0f8fcbe2 to gingerbread
blob
|
commitdiff
|
diff to current
2010-09-30
Xavier Ducrohet
am ffd5087e: Use the new sdk/build/tools.atree.
blob
|
commitdiff
|
diff to current
2010-09-27
Jean-Baptiste Queru
reconcile froyo-release into gingerbread
blob
|
commitdiff
|
diff to current
2010-09-24
Ficus Kirkpatrick
am 7978d50e: Add a workaround for a platform JAR parsin...
blob
|
commitdiff
|
diff to current
2010-09-23
Ying Wang
resolved conflicts for merge of b368bba4 to gingerbread...
blob
|
commitdiff
|
diff to current
2010-09-10
Gary King
am 1e80c294: [build] move dumpvar.mk include after...
blob
|
commitdiff
|
diff to current
2010-09-10
Jean-Baptiste Queru
am cc84526b: Merge "Add atom optimization flags"
blob
|
commitdiff
|
diff to current
2010-09-02
Ying Wang
am 42f40659: Merge "Disable new longjmp in glibc 2...
blob
|
commitdiff
|
diff to current
2010-09-01
Jean-Baptiste Queru
am 85fd5030: Revert "Fixed problem with keymap files...
blob
|
commitdiff
|
diff to current
2010-08-31
Jean-Baptiste Queru
am a160e316: Merge "Fixed problem with keymap files...
blob
|
commitdiff
|
diff to current
2010-08-30
Ying Wang
am 9a8732fb: Link against Mac OSX 10.5 SDK if building...
blob
|
commitdiff
|
diff to current
2010-08-29
Raphael Moll
am 6ba4b59c: SDK: add hierarchyviewer2 to windows targe...
blob
|
commitdiff
|
diff to current
2010-08-25
Jean-Baptiste Queru
Manual merge
blob
|
commitdiff
|
diff to current
2010-08-25
Jean-Baptiste Queru
Manual merge
blob
|
commitdiff
|
diff to current
2010-08-24
Jean-Baptiste Queru
merge -s ours from froyo-release so that upgrading...
blob
|
commitdiff
|
diff to current
2010-08-18
android-build Shar...
am 817a8ac9: (-s ours) bump version from 2.2 to 2.2...
blob
|
commitdiff
|
diff to current
2010-08-17
Raphael Moll
am ddeb150d: Add easymock for list of Windows SDK targets.
blob
|
commitdiff
|
diff to current
2010-08-16
Jean-Baptiste Queru
am 43d406e5: Merge "add drm/ directory to include it...
blob
|
commitdiff
|
diff to current
2010-08-05
Scott Main
am 4f2436dc: update carousel icon for nexus one dev...
blob
|
commitdiff
|
diff to current
2010-08-05
Scott Main
am 7589398c: Merge "Doc change: Add nexus one to dev...
blob
|
commitdiff
|
diff to current
2010-07-29
Ying Wang
am 55edb20e: Merge "Dist apkcerts.txt for unbundled...
blob
|
commitdiff
|
diff to current
2010-07-28
Xavier Ducrohet
am e743c53b: Package ddmlib-prebuilt with CTS.
blob
|
commitdiff
|
diff to current
2010-07-28
The Android Open...
am 3a0576a4: merge from open-source froyo
blob
|
commitdiff
|
diff to current
2010-07-26
The Android Open...
am af44485f: merge from open-source froyo
blob
|
commitdiff
|
diff to current
2010-07-23
Evan Charlton
resolved conflicts for merge of 121a7873 to gingerbread
blob
|
commitdiff
|
diff to current
2010-07-23
Jean-Baptiste Queru
am 8339ba91: Merge "Replaced AlarmClock with DeskClock"
blob
|
commitdiff
|
diff to current
2010-07-23
Ying Wang
am bce4b75f: Add JNI_H_INCLUDE as default header search...
blob
|
commitdiff
|
diff to current
2010-07-22
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-07-22
Ying Wang
am d5c217ac: Merge "add phony target "all_modules"...
blob
|
commitdiff
|
diff to current
2010-07-22
Ying Wang
am 75b28573: Fix sim build for unbundling native code
blob
|
commitdiff
|
diff to current
2010-07-16
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-07-16
The Android Automerger
Merge branch 'master' into honeycomb-release
blob
|
commitdiff
|
diff to current
2010-07-16
The Android Automerger
Merge branch 'gingerbread' into gingerbread-release
blob
|
commitdiff
|
diff to current
2010-07-16
Andy McFadden
Merge "Update runhat command to use "am dumpheap"."
blob
|
commitdiff
|
diff to current
2010-07-15
Scott Main
am 9269a711: docs: ensure code-ified links in qv are...
blob
|
commitdiff
|
diff to current
next