summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-devYing Wang2012-08-143-12/+5
|\
| * Adopt the new prebuilts/ndk/<number> paths.Ying Wang2012-08-143-12/+5
* | am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"Jean-Baptiste Queru2012-08-141-1/+0
|\ \ | |/ |/|
| * am 4eddad55: Merge "Set the AOSP master to be API level 16"Jean-Baptiste Queru2012-08-141-2/+1
| |\
| | * Merge "Set the AOSP master to be API level 16"Jean-Baptiste Queru2012-08-141-2/+1
| | |\
| | | * Set the AOSP master to be API level 16Jean-Baptiste Queru2012-08-141-2/+1
| | |/
* | | am d3d0beca: am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PAC...Ying Wang2012-08-132-8/+13
|\ \ \ | |/ /
| * | am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"Ying Wang2012-08-132-8/+13
| |\ \ | | |/
| | * Merge "Move the selinux modules to core PRODUCT_PACKAGES"Ying Wang2012-08-132-8/+13
| | |\
| | | * Move the selinux modules to core PRODUCT_PACKAGESYing Wang2012-08-132-8/+13
| | |/
* | | am d7547163: am 679b7498: Merge "Add mac_permissions.xml dependency."Ying Wang2012-08-131-1/+1
|\ \ \ | |/ /
| * | am 679b7498: Merge "Add mac_permissions.xml dependency."Ying Wang2012-08-131-1/+1
| |\ \ | | |/
| | * Merge "Add mac_permissions.xml dependency."Ying Wang2012-08-131-1/+1
| | |\
| | | * Add mac_permissions.xml dependency.rpcraig2012-07-201-1/+1
* | | | resolved conflicts for merge of 0ac38a4e to jb-mr1-devElliott Hughes2012-08-111-185/+0
|\ \ \ \ | |/ / /
| * | | am 20e713d1: Merge "Remove TARGET_linux-sh.mk."Elliott Hughes2012-08-111-185/+0
| |\ \ \ | | |/ /
| | * | Merge "Remove TARGET_linux-sh.mk."Elliott Hughes2012-08-111-185/+0
| | |\ \
| | | * | Remove TARGET_linux-sh.mk.Elliott Hughes2012-08-101-185/+0
| | |/ /
* | | | Merge "Include FusedLocation.apk on all builds." into jb-mr1-devNick Pelly2012-08-101-0/+1
|\ \ \ \
| * | | | Include FusedLocation.apk on all builds.Nick Pelly2012-08-101-0/+1
* | | | | Merge "Use new flag for emma instrumented build and limit to apps only" into ...Guang Zhu2012-08-101-0/+15
|\ \ \ \ \
| * | | | | Use new flag for emma instrumented build and limit to apps onlyGuang Zhu2012-08-081-0/+15
* | | | | | add libstagefright_chromium_http to mini for streamingKeun young Park2012-08-101-0/+2
* | | | | | Merge "arm: add --warn-shared-textrel" into jb-mr1-devNick Kralevich2012-08-101-0/+1
|\ \ \ \ \ \
| * | | | | | arm: add --warn-shared-textrelNick Kralevich2012-08-101-0/+1
| | |/ / / / | |/| | | |
* | | | | | am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"Jean-Baptiste Queru2012-08-106-9/+32
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"Jean-Baptiste Queru2012-08-106-9/+32
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "MIPS support to *.mk files and envsetup.sh"Jean-Baptiste Queru2012-08-106-9/+32
| | |\ \ \ \
| | | * | | | MIPS support to *.mk files and envsetup.shRaghu Gandham2012-08-106-9/+32
| | |/ / / /
* | | | | | am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets."Jean-Baptiste Queru2012-08-109-0/+402
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6e6d92c4: Merge "Support for MIPS Build targets."Jean-Baptiste Queru2012-08-109-0/+402
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Support for MIPS Build targets."Jean-Baptiste Queru2012-08-109-0/+402
| | |\ \ \ \
| | | * | | | Support for MIPS Build targets.Raghu Gandham2012-08-019-0/+402
* | | | | | | resolved conflicts for merge of dd14acc3 to jb-mr1-devJean-Baptiste Queru2012-08-103-9/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e443a9e9: Merge "Modify full_mips-eng build in line with the full-eng build"Jean-Baptiste Queru2012-08-103-11/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Modify full_mips-eng build in line with the full-eng build"Jean-Baptiste Queru2012-08-103-11/+8
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Modify full_mips-eng build in line with the full-eng buildChris Dearman2012-08-013-11/+8
* | | | | | | am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-100-0/+0
| |\ \ \ \ \ \
| | * | | | | | JZO40The Android Automerger2012-08-091-13/+3
| | * | | | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-090-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge "Add make_ext4fs to all builds" into jb-mr1-devKenny Root2012-08-091-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add make_ext4fs to all buildsKenny Root2012-08-091-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | tidy up building of recovery ramdisk imageDoug Zongker2012-08-091-19/+18
|/ / / / / / / /
* | | | | | | | Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-devColin Cross2012-08-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | recovery: don't delete hardware specific init*.rc filesColin Cross2012-08-081-1/+1
* | | | | | | | | Don't install overridden packages in pdk fusion files.Ying Wang2012-08-081-1/+5
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-082-17/+19
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 8776f34a: Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-082-17/+19
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-082-17/+19
| | |\ \ \ \ \ \