summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Compile each proto file separatelyBjorn Bringert2011-10-181-5/+7
* am 04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared librar...Ying Wang2011-09-201-0/+11
|\
| * Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ic...Ying Wang2011-09-201-0/+11
| |\
| | * Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.Ying Wang2011-09-151-0/+11
* | | Merge "Install path support for vendor modules."Ying Wang2011-09-203-5/+18
|\ \ \
| * | | Install path support for vendor modules.Ying Wang2011-09-133-5/+18
* | | | am 7094bf3a: am 25863d73: build the sqlite3 binary for use by the OTA toolsDoug Zongker2011-09-201-0/+1
|\ \ \ \
| * \ \ \ am 25863d73: build the sqlite3 binary for use by the OTA toolsDoug Zongker2011-09-201-0/+1
| |\ \ \ \
| | * | | | build the sqlite3 binary for use by the OTA toolsDoug Zongker2011-09-191-0/+1
* | | | | | Reconcile with ics-factoryrom-releaseJean-Baptiste Queru2011-09-200-0/+0
|\ \ \ \ \ \
| * | | | | | IFK82The Android Automerger2011-09-201-13/+3
| * | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-200-0/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | IFK81CThe Android Automerger2011-09-191-1/+1
| | * | | | | IFK81BThe Android Automerger2011-09-191-1/+1
* | | | | | | am 514c487d: (-s ours) Enable building sdk/avdlauncher in the Win SDK. DO NOT...Raphael2011-09-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.Raphael2011-09-161-0/+1
* | | | | | | am 77fed269: (-s ours) Don\'t strip llvm-rs-rc in core/Makefile. DO NOT MERGE.Raphael2011-09-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE.Raphael2011-09-161-9/+0
* | | | | | | am 131292c0: (-s ours) Add rm and strip abilities to atree. DO NOT MERGE.Raphael2011-09-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add rm and strip abilities to atree. DO NOT MERGE.Raphael2011-09-165-62/+191
| | |_|_|_|/ | |/| | | |
* | | | | | New LOCAL_SDK_RES_VERSION config var.Dianne Hackborn2011-09-192-4/+10
* | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-190-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | IFK81The Android Automerger2011-09-191-13/+3
| * | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-190-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | IFK80DThe Android Automerger2011-09-181-1/+1
| | * | | | IFK80CThe Android Automerger2011-09-181-1/+1
| | * | | | IFK80BThe Android Automerger2011-09-181-1/+1
| | * | | | IFK80The Android Automerger2011-09-181-13/+3
| | * | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-180-0/+0
| | |\ \ \ \ | |/ / / / /
| | * | | | IFK77EThe Android Automerger2011-09-171-1/+1
| | * | | | IFK77DThe Android Automerger2011-09-161-1/+1
* | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-160-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | IFK77CThe Android Automerger2011-09-151-1/+1
| * | | | | IFK77BThe Android Automerger2011-09-151-17/+18
| * | | | | correct branch id to 'IF'Ed Heyl2011-09-151-1/+1
| * | | | | IPK77Ed Heyl2011-09-151-29/+18
* | | | | | Merge "Don't strip llvm-rs-rc in core/Makefile"Raphael2011-09-161-9/+0
|\ \ \ \ \ \
| * | | | | | Don't strip llvm-rs-rc in core/MakefileRaphael2011-09-151-9/+0
* | | | | | | Merge "Enable building sdk/avdlauncher in the Win SDK."Raphael2011-09-161-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Enable building sdk/avdlauncher in the Win SDK.Raphael2011-09-161-0/+1
* | | | | | | | Merge "Add rm and strip abilities to atree."Raphael2011-09-165-62/+191
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Add rm and strip abilities to atree.Raphael2011-09-155-62/+191
| |/ / / / /
* | | | | | Use LOCAL_REQUIRED_MODULES to add dependency of installed shared librariesYing Wang2011-09-151-56/+56
| |/ / / / |/| | | |
* | | | | Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryromEd Heyl2011-09-152-3/+10
|\ \ \ \ \ | |/ / / /
| * | | | Hello, Android 4.0.Dianne Hackborn2011-09-142-3/+10
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-releaseThe Android Open Source Project2011-09-140-0/+0
| |\ \ \ \ \ \
| | | | * | | | HLK75The Android Automerger2011-09-131-1/+1
| | | | * | | | HLK73BThe Android Automerger2011-09-121-1/+1
| | | * | | | | GWK74Ed Heyl2011-09-131-1/+1
| | | * | | | | GWK73The Android Automerger2011-09-121-1/+1