summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 3d6e194e: am 393c6254: Really include drawables for all densities.Ying Wang2015-09-291-3/+0
|\
| * am 393c6254: Really include drawables for all densities.Ying Wang2015-09-291-3/+0
| |\
| | * Really include drawables for all densities.Ying Wang2015-09-291-3/+0
* | | am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-...Zach Jang2015-09-281-1/+1
|\ \ \ | |/ /
| * | am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OT...Zach Jang2015-09-281-1/+1
| |\ \ | | |/
| | * Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-devZach Jang2015-09-281-1/+1
| | |\
| | | * Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTAZach Jang2015-09-211-1/+1
* | | | Add ld.mc as a requirement for core_tiny.mk as well.Stephen Hines2015-09-221-0/+1
* | | | am 6a0bdb55: am 64685ea3: am ef024064: (-s ours) am 09611509: am 63712481: am...Zach Jang2015-09-220-0/+0
|\ \ \ \ | |/ / /
| * | | am 64685ea3: am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am...Zach Jang2015-09-220-0/+0
| |\ \ \ | | |/ /
| | * | am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am a7168e1c: am...Zach Jang2015-09-210-0/+0
| | |\ \
| | | * \ am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am...Zach Jang2015-09-210-0/+0
| | | |\ \
| | | | * \ am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am...Zach Jang2015-09-210-0/+0
| | | | |\ \
| | | | | * \ am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO...Zach Jang2015-09-210-0/+0
| | | | | |\ \
| | | | | | * \ am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - ...Zach Jang2015-09-170-0/+0
| | | | | | |\ \
| | | | | | | * \ am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of a...Zach Jang2015-09-170-0/+0
| | | | | | | |\ \
| | | | | | | | * \ am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Pat...Zach Jang2015-09-174-0/+24
| | | | | | | | |\ \
| | | | | | | | | * \ am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in S...Zach Jang2015-09-174-0/+24
| | | | | | | | | |\ \
| | | | | | | | | | * | DO NOT MERGE - Backport of ag/748221 - Security Patch Level in SettingsZach Jang2015-09-174-0/+24
* | | | | | | | | | | | am 22e66b35: am a5842d3e: am f694d378: (-s ours) resolved conflicts for b1612...Zach Jang2015-09-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am a5842d3e: am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr...Zach Jang2015-09-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-devZach Jang2015-09-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | | * | | | | | | | resolved conflicts for b161297d to lmp-mr1-ub-devZach Jang2015-09-214-0/+23
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am ab095b44: am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 -...Zach Jang2015-09-214-0/+24
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Pat...Zach Jang2015-09-214-0/+24
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in S...Zach Jang2015-09-174-0/+24
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | DO NOT MERGE - Backport of ag/748221 - Security Patch Level in SettingsZach Jang2015-09-174-0/+24
* | | | | | | | | | | am 59f4ff10: Add verity_signer and verity_key flags to add_img_to_target_files.Baligh Uddin2015-09-171-2/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add verity_signer and verity_key flags to add_img_to_target_files.Baligh Uddin2015-09-161-2/+14
* | | | | | | | | | | am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into m...Bo Hu2015-09-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-devBo Hu2015-09-161-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "emulator.mk: Add ethernet permission" into mnc-devBo Hu2015-09-161-0/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | emulator.mk: Add ethernet permissionbohu2015-09-141-0/+1
* | | | | | | | | | | | am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-devIan Pedowitz2015-09-161-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | resolved conflicts for a1fcaf86 to mnc-dr-devIan Pedowitz2015-09-151-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Add an option to include a full bootloader in incremental OTA.leozwang2015-09-151-0/+9
* | | | | | | | | | | | am 07e0af0d: am 91c8c66e: am 17aa06f6: Fix build.leozwang2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 91c8c66e: am 17aa06f6: Fix build.leozwang2015-09-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 17aa06f6: Fix build.leozwang2015-09-151-1582/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Fix build.leozwang2015-09-151-1582/+1
* | | | | | | | | | | | am 1e7f6f74: Fix build.leozwang2015-09-151-1582/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix build.leozwang2015-09-151-1582/+1
* | | | | | | | | | | | am 888b6f47: am 47f6a4e7: am 1c1a6d15: am 2c9dfb82: am 1d4ad515: Revert "Add ...Leo Wang2015-09-151-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 47f6a4e7: am 1c1a6d15: am 2c9dfb82: am 1d4ad515: Revert "Add an option to ...Leo Wang2015-09-151-9/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 1c1a6d15: am 2c9dfb82: am 1d4ad515: Revert "Add an option to include a ful...Leo Wang2015-09-151-9/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 2c9dfb82: am 1d4ad515: Revert "Add an option to include a full bootloader ...Leo Wang2015-09-151-9/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | am 1d4ad515: Revert "Add an option to include a full bootloader in incrementa...Leo Wang2015-09-151-9/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | * | | | | | | Revert "Add an option to include a full bootloader in incremental OTA."Leo Wang2015-09-151-9/+0
* | | | | | | | | | | | am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp...leozwang2015-09-151-1/+1591
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-devleozwang2015-09-151-1/+1591
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /