summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove references to layoutopt from the build.Xavier Ducrohet2011-10-263-3/+0
* Revert "Remove layoutopt; replaced by the more generic "lint" tool."Omari Stephens2011-10-263-0/+6
* Merge "Remove layoutopt; replaced by the more generic "lint" tool."Tor Norbye2011-10-263-6/+0
|\
| * Remove layoutopt; replaced by the more generic "lint" tool.Tor Norbye2011-10-263-6/+0
* | am 5e528222: am 8bb6ea59: Merge "docs: add new style for adding "deprecated" ...Scott Main2011-10-261-1/+15
|\ \
| * \ am 8bb6ea59: Merge "docs: add new style for adding "deprecated" messages to d...Scott Main2011-10-261-1/+15
| |\ \
| | * \ Merge "docs: add new style for adding "deprecated" messages to dev guides" in...Scott Main2011-10-261-1/+15
| | |\ \
| | | * | docs: add new style for adding "deprecated" messages to dev guidesScott Main2011-10-241-1/+15
* | | | | Merge "enable PIE for dynamically linked executables"Nick Kralevich2011-10-261-2/+2
|\ \ \ \ \
| * | | | | enable PIE for dynamically linked executablesNick Kralevich2011-10-241-2/+2
* | | | | | am 525389ee: (-s ours) set ID to MR1. Please do not merge.Ed Heyl2011-10-260-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | set ID to MR1. Please do not merge.Ed Heyl2011-10-251-1/+1
| |/ / / /
* | | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-252-18/+18
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-250-0/+0
|\ \ \ \ \
| * | | | | ICL25The Android Automerger2011-10-251-13/+3
| * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-250-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | ICL24DThe Android Automerger2011-10-241-13/+3
| | * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | |\ \ \ \ | |/ / / / /
* | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | ICL24CThe Android Automerger2011-10-241-13/+3
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | ICL24BThe Android Automerger2011-10-241-13/+3
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | |\ \ \ | |/ / / /
| | | | |
| \ \ \ \
*-. \ \ \ \ Reconcile with ics-factoryrom-release ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | ICL24The Android Automerger2011-10-241-13/+3
| | * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | ICL23DThe Android Automerger2011-10-231-13/+3
| | | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-230-0/+0
| | | |\ \ \ | | |/ / / /
| | | * | | ICL23CThe Android Automerger2011-10-231-13/+3
| | | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-230-0/+0
| | | |\ \ \ | | |/ / / /
| | | * | | ICL23BThe Android Automerger2011-10-231-13/+3
| | | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-230-0/+0
| | | |\ \ \ | | |/ / / /
| | | * | | ICL23The Android Automerger2011-10-231-13/+3
| | | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-230-0/+0
| | | |\ \ \ | | |/ / / /
| | | * | | ICL22The Android Automerger2011-10-221-13/+3
| | | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-220-0/+0
| | | |\ \ \ | | |/ / / /
| | | * | | ICL21CThe Android Automerger2011-10-211-13/+3
| | | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| | | |\ \ \ | | |/ / / /
| | | * | | ICL21BThe Android Automerger2011-10-211-1/+1
| | | * | | ICL21The Android Automerger2011-10-211-13/+3
| | | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | ICL20CThe Android Automerger2011-10-201-13/+3
| | | | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| | | | |\ \ | | | |/ / /
| | | | * | ICL20BThe Android Automerger2011-10-201-1/+1
| * | | | | IFL10FThe Android Automerger2011-10-201-13/+3
| * | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-200-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge "Move VpnDialogs into core.mk."Chia-chi Yeh2011-10-212-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Move VpnDialogs into core.mk.Chia-chi Yeh2011-10-212-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 07767a9e: (-s ours) Move VpnDialogs into core.mk.Chia-chi Yeh2011-10-210-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Move VpnDialogs into core.mk.Chia-chi Yeh2011-10-212-3/+2
| | |_|_|/ / | |/| | | |