summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am cc317c40: am 40f33005: am fa63e306: Merge "Fix the CTS build now that core...Neil Fuller2014-06-191-1/+1
|\
| * am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone"Neil Fuller2014-06-191-1/+1
| |\
| | * Fix the CTS build now that core is goneNeil Fuller2014-06-191-1/+1
* | | Merge changes Ib9d1863c,I2a6eb327Narayan Kamath2014-06-171-1/+12
|\ \ \
| * | | Fix issue in symlinking 64 bit executables.Narayan Kamath2014-06-171-1/+12
* | | | pdk: add core-libart_intermediatesColin Cross2014-06-181-1/+1
* | | | resolved conflicts for merge of 8fd9944e to masterBrian Carlstrom2014-06-186-7/+7
|\ \ \ \ | | |/ / | |/| |
| * | | am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"Brian Carlstrom2014-06-196-7/+7
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Switch from core to core-libart"Brian Carlstrom2014-06-186-7/+7
| | |\ \
| | | * | Switch from core to core-libartBrian Carlstrom2014-06-186-7/+7
* | | | | am 451dbd7c: am cc2e90e6: am 0f1ca830: Merge "Rewrite the clean steps for TAR...Ying Wang2014-06-181-0/+22
|\ \ \ \ \ | |/ / / /
| * | | | am cc2e90e6: am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."Ying Wang2014-06-181-0/+22
| |\ \ \ \ | | |/ / /
| | * | | Merge "Rewrite the clean steps for TARGET_2ND_ARCH."Ying Wang2014-06-181-0/+22
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Rewrite the clean steps for TARGET_2ND_ARCH.Ying Wang2014-06-181-0/+22
* | | | | am a1ac4736: am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"Colin Cross2014-06-184-21/+1
|\ \ \ \ \ | |/ / / /
| * | | | am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"Colin Cross2014-06-184-21/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "build: delete 64-bit blacklist"Colin Cross2014-06-174-21/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | build: delete 64-bit blacklistColin Cross2014-06-174-21/+1
* | | | | am 88440c53: am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."Ying Wang2014-06-181-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."Ying Wang2014-06-181-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Use the correct MKBOOTIMG.Ying Wang2014-06-181-2/+2
| | |/ /
| * | | am aaa502bc: am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT...Deepanshu Gupta2014-06-181-0/+8
| |\ \ \
| | * \ \ am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into...Deepanshu Gupta2014-06-181-0/+8
| | |\ \ \
| | | * \ \ am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-devDeepanshu Gupta2014-06-181-0/+8
| | | |\ \ \
| | | | * \ \ Merge "Integrate build_font.py [DO NOT MERGE]" into klp-devDeepanshu Gupta2014-06-171-0/+8
| | | | |\ \ \
| | | | | * | | Integrate build_font.py [DO NOT MERGE]Deepanshu Gupta2014-06-121-0/+8
| | | * | | | | am 3b118a55: MR2.1 - Version 4.4.4. Here we go! DO NOT MERGEBart Sears2014-06-061-1/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | MR2.1 - Version 4.4.4. Here we go! DO NOT MERGEBart Sears2014-06-061-1/+1
* | | | | | | | Merge "core+tools: support specifying F2FS as the fstype for userdata"JP Abgrall2014-06-173-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | core+tools: support specifying F2FS as the fstype for userdataJP Abgrall2014-06-173-1/+10
* | | | | | | | | am e87fcf5e: Revert "Add missing support lib to list."Xavier Ducrohet2014-06-181-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Add missing support lib to list."Xavier Ducrohet2014-06-171-3/+1
* | | | | | | | | | am a44f9a35: am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit err...Brian Carlstrom2014-06-171-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit errors."Brian Carlstrom2014-06-171-1/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Help catch common 32/64-bit errors.Brian Carlstrom2014-06-171-1/+5
* | | | | | | | | am b3ae5354: Add missing support lib to list.Xavier Ducrohet2014-06-171-1/+3
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Add missing support lib to list.Xavier Ducrohet2014-06-171-1/+3
* | | | | | | | | Less spammy ProGuard.Ying Wang2014-06-171-0/+3
* | | | | | | | | Merge "full support for OTA of vendor partitions"Doug Zongker2014-06-171-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | full support for OTA of vendor partitionsDoug Zongker2014-06-161-1/+3
* | | | | | | | | | resolved conflicts for merge of b60ccd66 to masterNarayan Kamath2014-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"Narayan Kamath2014-06-171-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Make default 64-bit primary, 32-bit secondary"Narayan Kamath2014-06-171-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make default 64-bit primary, 32-bit secondaryBrian Carlstrom2014-06-161-1/+1
| * | | | | | | | | am fe86a7c1: am a530bd40: Merge "Also include the binaries for the 2nd arch."Ying Wang2014-06-161-3/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Also include the binaries for the 2nd arch."Ying Wang2014-06-161-3/+7
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Also include the binaries for the 2nd arch.Ying Wang2014-06-161-3/+7
| * | | | | | | | | | am e6b3692b: am c17e0f92: Merge "Explicit record the modules\' built-file:ins...Ying Wang2014-06-163-18/+26
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Explicit record the modules' built-file:installed-file"Ying Wang2014-06-163-18/+26
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Explicit record the modules' built-file:installed-fileYing Wang2014-06-163-18/+26