summaryrefslogtreecommitdiffstats
path: root/CleanSpec.mk
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aospNarayan Kamath2015-01-221-0/+4
|\
| * Add ro.product.localeNarayan Kamath2015-01-161-0/+4
* | resolve conflicts w/aaf823d2Ed Heyl2014-12-081-0/+5
|\ \
| * | Fix issue #18368417: 5.0 -> 5.1.Dianne Hackborn2014-12-041-0/+5
* | | am 29f8d7d6: Merge "Make gnu++11 the default standard version."Dan Albert2014-11-251-0/+5
|\ \ \ | | |/ | |/|
| * | Make gnu++11 the default standard version.Dan Albert2014-11-241-0/+5
* | | am 74b2870a: Merge "Clean out *.prop files due to dex2oat instruction-set fla...Stephen Hines2014-11-141-0/+5
|\ \ \ | |/ /
| * | Clean out *.prop files due to dex2oat instruction-set flag change.Stephen Hines2014-11-131-0/+5
* | | resolved conflicts for merge of ebc32090 to lmp-mr1-dev-plus-aospDan Albert2014-11-071-0/+3
|\ \ \ | |/ /
| * | Cleanspec for libc++ migration.Dan Albert2014-11-071-0/+3
| * | am e105b8f2: Merge "And then L, without ever becoming a real code name, trans...Dianne Hackborn2014-09-251-0/+5
| |\ \
* | \ \ am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-devDianne Hackborn2014-10-171-0/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Move up to API 21, Lollipop MR1.Dianne Hackborn2014-10-171-0/+5
| | |/ | |/|
* | | am e105b8f2: Merge "And then L, without ever becoming a real code name, trans...Dianne Hackborn2014-09-261-0/+5
|\ \ \ | |/ / | | / | |/ |/|
| * And then L, without ever becoming a real code name, transforms like magic to ...Dianne Hackborn2014-09-221-0/+5
* | am e4584a41: Merge "Shhhhhhh!!!" into lmp-devDianne Hackborn2014-08-261-0/+5
|\ \ | |/
| * Shhhhhhh!!!Dianne Hackborn2014-08-261-0/+5
| * Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]Brian Carlstrom2014-08-061-0/+6
* | resolved conflicts for merge of 9b80095e to lmp-dev-plus-aospBrian Carlstrom2014-08-041-0/+5
|\ \
| * | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]Brian Carlstrom2014-07-301-0/+6
* | | resolved conflicts for merge of 2812b27c to lmp-dev-plus-aospTim Murray2014-07-241-0/+4
|\ \ \ | |/ / | | / | |/ |/|
| * Switch host builds to use Clang by default.Tim Murray2014-07-241-0/+3
* | New installation path for apks and their JNIs.Ying Wang2014-07-181-0/+2
* | am ef0b6e0c: am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product ...Brian Carlstrom2014-07-091-0/+5
|\ \
| * \ am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable ...Brian Carlstrom2014-07-091-0/+5
| |\ \ | | |/
| | * Make dex2oat heap size product configurable [build]Brian Carlstrom2014-07-081-0/+5
* | | resolved conflicts for merge of b60ccd66 to masterNarayan Kamath2014-06-171-0/+3
|\ \ \ | |/ /
| * | am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"Narayan Kamath2014-06-171-0/+3
| |\ \ | | |/
| | * Make default 64-bit primary, 32-bit secondaryBrian Carlstrom2014-06-161-0/+3
* | | Adding CleanSpec for adding BOOTCLASSPATH to ims-common.jarBrian Carlstrom2014-06-131-0/+3
* | | resolved conflicts for merge of 0c651756 to masterDianne Hackborn2014-06-121-0/+5
|\ \ \
| * | | Update to reflect KKWT's graduation to API 20.Dianne Hackborn2014-06-111-0/+5
* | | | am 2d19cbd2: resolved conflicts for merge of 135e11df to klp-modular-dev-plus...Ying Wang2014-06-111-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aospYing Wang2014-06-101-0/+3
| |\ \ \ | | | |/ | | |/|
| | * | Switch to 32-bit-by-default host multilib build.Ying Wang2014-06-091-0/+3
| * | | resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aospBrian Carlstrom2014-05-291-0/+3
| |\ \ \ | | |/ /
| | * | am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in ge...Brian Carlstrom2014-05-291-0/+3
| | |\ \
| | | * | Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-0/+3
| * | | | am ed97938c: am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to ...Brian Carlstrom2014-05-281-0/+3
| |\ \ \ \ | | |/ / /
| | * | | am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-0/+3
| | |\ \ \ | | | |/ /
| | | * | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-0/+3
* | | | | am bf8a374a: Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-0/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-281-0/+3
* | | | | resolved conflicts for merge of 7e127ebe to masterBrian Carlstrom2014-05-281-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-0/+3
* | | | | resolved conflicts for merge of 38c3c930 to masterNarayan Kamath2014-05-271-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 6c2ae327: am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-271-0/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-271-0/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Switch x86_64 emulator to 64 bit primary.Narayan Kamath2014-05-271-0/+4
* | | | | am 06db7324: resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus...Narayan Kamath2014-05-271-0/+3
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |