summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am e6b9f286: am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when ↵Ying Wang2015-03-261-3/+3
|\ | | | | | | | | | | | | check-boot-jars.py fails" * commit 'e6b9f2869110a35316022c639bf3d932034783d3': Fix: exit code is 0 even when check-boot-jars.py fails
| * am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when ↵Ying Wang2015-03-261-3/+3
| |\ | | | | | | | | | | | | | | | | | | check-boot-jars.py fails" * commit 'bc9ade722f2fe2d4dcc71931cdfd62661d822027': Fix: exit code is 0 even when check-boot-jars.py fails
| | * am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"Ying Wang2015-03-261-3/+3
| | |\ | | | | | | | | | | | | | | | | * commit 'd5415dc778abffdf7a9abba52b093da7a20496be': Fix: exit code is 0 even when check-boot-jars.py fails
| | | * Merge "Fix: exit code is 0 even when check-boot-jars.py fails"Ying Wang2015-03-261-3/+3
| | | |\
| | | | * Fix: exit code is 0 even when check-boot-jars.py failsJiyong Park2015-03-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the bug that build is still success when boot jars contain non-whitelisted classes. Now, check-boot-jars.py correctly finishes with exit code 1 when non-whitelisted classes are found. Change-Id: Id5c80ef9fdb70213d878d569f6033be2c9eb90d3
* | | | | Merge "Add bootsigner path as an option"Baligh Uddin2015-03-261-2/+6
|\ \ \ \ \
| * | | | | Add bootsigner path as an optionBaligh Uddin2015-02-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71e8cb96b7a33cc02897fc24f6f3f61c7608bfe3
* | | | | | am b595d5a3: am a2ef9dd1: am 1a10d739: merge in lmp-mr1-sdk-release history ↵The Android Automerger2015-03-260-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after reset to lmp-mr1-ub-dev * commit 'b595d5a330dc349888e8fe155f4171bcd8a2845f': (40 commits) "LKY79" "LKY78" "LKY77" "LKY76" "LKY75" "LKY73" "LKY72" "LKY71" "LKY70" "LKY69" "LKY68" "LKY66" "LKY65" "LKY64" "LKY63" "LKY62" LKY61B "LKY61" "LKY59" "LKY58" ...
| * | | | | am a2ef9dd1: am 1a10d739: merge in lmp-mr1-sdk-release history after reset ↵The Android Automerger2015-03-260-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to lmp-mr1-ub-dev * commit 'a2ef9dd1f90b8d090ec30a0e1af8322e1438ba10': (40 commits) "LKY79" "LKY78" "LKY77" "LKY76" "LKY75" "LKY73" "LKY72" "LKY71" "LKY70" "LKY69" "LKY68" "LKY66" "LKY65" "LKY64" "LKY63" "LKY62" LKY61B "LKY61" "LKY59" "LKY58" ...
| | * \ \ \ \ am 1a10d739: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-260-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a10d739a79721ec8154a28884746ce472104777': (40 commits) "LKY79" "LKY78" "LKY77" "LKY76" "LKY75" "LKY73" "LKY72" "LKY71" "LKY70" "LKY69" "LKY68" "LKY66" "LKY65" "LKY64" "LKY63" "LKY62" LKY61B "LKY61" "LKY59" "LKY58" ...
| | | * \ \ \ \ merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-210-0/+0
| | | |\ \ \ \ \
| | | | * | | | | "LKY79"The Android Automerger2015-03-201-1/+1
| | | | | | | | |
| | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-200-0/+0
| | | | |\ \ \ \ \ | | | |/ / / / / /
| | | | * | | | | "LKY78"The Android Automerger2015-03-191-1/+1
| | | | | | | | |
| | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-190-0/+0
| | | | |\ \ \ \ \ | | | |/ / / / / /
| | | | * | | | | "LKY77"The Android Automerger2015-03-181-1/+1
| | | | | | | | |
| | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-180-0/+0
| | | | |\ \ \ \ \
| | | | | * | | | | "LKY76"The Android Automerger2015-03-171-1/+1
| | | | | | | | | |
| | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-170-0/+0
| | | | | |\ \ \ \ \ | | | | |/ / / / / /
| | | | | * | | | | "LKY75"The Android Automerger2015-03-161-1/+1
| | | | | | | | | |
| | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-160-0/+0
| | | | | |\ \ \ \ \ | | | | |/ / / / / /
| | | | | * | | | | "LKY73"The Android Automerger2015-03-141-1/+1
| | | | | | | | | |
| | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-140-0/+0
| | | | | |\ \ \ \ \ | | | | |/ / / / / /
| | | | | * | | | | "LKY72"The Android Automerger2015-03-131-1/+1
| | | | | | | | | |
| | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-130-0/+0
| | | | | |\ \ \ \ \
| | | | | | * | | | | "LKY71"The Android Automerger2015-03-121-1/+1
| | | | | | | | | | |
| | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-120-0/+0
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | "LKY70"The Android Automerger2015-03-111-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-110-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY69"The Android Automerger2015-03-101-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-100-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY68"The Android Automerger2015-03-091-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-090-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY66"The Android Automerger2015-03-071-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-070-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY65"The Android Automerger2015-03-061-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-060-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY64"The Android Automerger2015-03-051-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-050-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY63"The Android Automerger2015-03-041-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-040-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY62"The Android Automerger2015-03-031-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-030-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | LKY61BThe Android Automerger2015-03-021-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | "LKY61"The Android Automerger2015-03-021-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-020-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY59"The Android Automerger2015-02-281-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-02-280-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | | * | | | | "LKY58"The Android Automerger2015-02-271-1/+1
| | | | | | | | | | | |
| | | | | | | * | | | | merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-02-270-0/+0
| | | | | | | |\ \ \ \ \