summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4187cee6: am 0b9e204d: Support matching unicode characters in suggestions ...Dirk Dougherty2015-07-081-21/+21
|\
| * am 0b9e204d: Support matching unicode characters in suggestions by changing m...Dirk Dougherty2015-07-081-21/+21
| |\
| | * Support matching unicode characters in suggestions by changing match(regex) t...Dirk Dougherty2015-07-021-21/+21
* | | Merge "Allow init to create /mnt/sdcard symlink." into mnc-devdcashman2015-07-062-0/+2
|\ \ \
| * | | Allow init to create /mnt/sdcard symlink.dcashman2015-07-012-0/+2
* | | | am a0cca8e6: (-s ours) am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syn...Chris Elliott2015-07-020-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify ...Chris Elliott2015-07-020-0/+0
| |\ \ \
| | * \ \ Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into ...Chris Elliott2015-07-021-5/+5
| | |\ \ \
| | | * | | DO NOT MERGE Fix the syntax error in the edify script generatorTao Bao2015-07-021-5/+5
* | | | | | am 41bcf3e4: (-s ours) Fix build.Tao Bao2015-07-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix build.Tao Bao2015-07-011-2/+2
* | | | | | am 608d9d24: (-s ours) am 1aa1af0e: sparse_img.py: Don\'t write empty map gro...Tao Bao2015-07-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1aa1af0e: sparse_img.py: Don\'t write empty map groups.Tao Bao2015-07-021-2/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | sparse_img.py: Don't write empty map groups.Tao Bao2015-07-011-2/+6
* | | | | | am e416a41f: (-s ours) am 16401ad4: Revert "sparse_img.py: Don\'t write empty...Simon Wilson2015-07-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups."Simon Wilson2015-07-021-6/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert "sparse_img.py: Don't write empty map groups."Simon Wilson2015-07-011-6/+2
| | |/ / /
* | | | | resolved conflicts for merge of 8787cd6d to mnc-devTao Bao2015-07-011-3/+8
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-devTao Bao2015-07-011-2/+6
| |\ \ \ | | |/ /
| | * | sparse_img.py: Don't write empty map groups.Tao Bao2015-07-011-2/+6
* | | | Retry adjusting the size computation for reserved blocks.Tao Bao2015-06-292-17/+68
* | | | Revert "Adjust the size computation for reserved blocks"Tao Bao2015-06-292-36/+1
* | | | Merge "Raise API level to 23." into mnc-devDianne Hackborn2015-06-272-1/+6
|\ \ \ \
| * | | | Raise API level to 23.Dianne Hackborn2015-06-262-1/+6
* | | | | am 78d1cba0: (-s ours) Fix conflict resolving error in ef5dc90bba179f774bee0c...Ying Wang2015-06-260-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix conflict resolving error in ef5dc90bba179f774bee0c7e479965cef12091deYing Wang2015-06-261-18/+0
* | | | Raise progaurd library to platform libraries even for "current" SDK.Ying Wang2015-06-261-2/+2
* | | | resolved conflicts for merge of 1a4658cd to mnc-devMohamad Ayyash2015-06-251-1/+1
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-devMohamad Ayyash2015-06-242-1/+20
| |\ \ \ | | |/ /
| | * | Add img2simg in host and ota packagesMohamad Ayyash2015-06-242-1/+3
* | | | am 48cb24a6: am 648e40e8: build_image.py: Make sparse squashfs imagesMohamad Ayyash2015-06-240-0/+0
|\ \ \ \ | |/ / /
| * | | am 648e40e8: build_image.py: Make sparse squashfs imagesMohamad Ayyash2015-06-241-0/+1
| |\ \ \ | | |/ /
| | * | build_image.py: Make sparse squashfs imagesMohamad Ayyash2015-06-241-0/+1
* | | | Merge "build_image.py: Make sparse squashfs images" into mnc-devMohamad Ayyash2015-06-241-0/+1
|\ \ \ \
| * | | | build_image.py: Make sparse squashfs imagesMohamad Ayyash2015-06-241-0/+1
* | | | | Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-devSimon Wilson2015-06-242-0/+8
|\ \ \ \ \
| * \ \ \ \ resolved conflicts for merge of ecfc97f7 to mnc-devSimon Wilson2015-06-242-0/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | resolved conflicts for merge of f86e7eea to lmp-mr1-ub-devSimon Wilson2015-06-242-0/+8
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Add compressor options for squashfs system imagesSimon Wilson2015-06-222-0/+8
* | | | | | Merge "Add img2simg in host and ota packages" into mnc-devMohamad Ayyash2015-06-242-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add img2simg in host and ota packagesMohamad Ayyash2015-06-242-1/+3
| | |_|/ / | |/| | |
* | | | | am 9ca7fa89: resolved conflicts for merge of 1b748051 to lmp-mr1-ub-devMohamad Ayyash2015-06-240-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | resolved conflicts for merge of 1b748051 to lmp-mr1-ub-devMohamad Ayyash2015-06-241-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | common.py: Add support for squashfsMohamad Ayyash2015-06-161-3/+8
* | | | | Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-devAdam Powell2015-06-241-1/+1
|\ \ \ \ \
| * | | | | Bump PLATFORM_PREVIEW_SDK_VERSION to 2Adam Powell2015-06-241-1/+1
* | | | | | Add hid command to base buildMichael Wright2015-06-241-0/+1
* | | | | | am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-devMohamad Ayyash2015-06-241-0/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | resolved conflicts for merge of cade49dd to lmp-mr1-ub-devMohamad Ayyash2015-06-231-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Allow flashing a squashfs system imageMohamad Ayyash2015-06-164-0/+24