Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 021ff2ee: am 9edfa6db: docs: move home.css into default.css to reduce numb... | Scott Main | 2012-08-14 | 3 | -95/+95 |
|\ | |||||
| * | am 9edfa6db: docs: move home.css into default.css to reduce number of requests | Scott Main | 2012-08-14 | 3 | -95/+95 |
| |\ | |||||
| | * | docs: move home.css into default.css to reduce number of requests | Scott Main | 2012-08-14 | 3 | -95/+95 |
* | | | allow diff program to be selected explicitly | Doug Zongker | 2012-08-14 | 1 | -3/+7 |
* | | | Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev | Jesse Hall | 2012-08-14 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Include FusedLocation.apk on sdk builds too | Jesse Hall | 2012-08-14 | 1 | -0/+1 |
* | | | | Force out LOCAL_NDK_VERSION. | Ying Wang | 2012-08-14 | 1 | -0/+3 |
* | | | | Retire LOCAL_NDK_VERSION. | Ying Wang | 2012-08-14 | 5 | -35/+17 |
* | | | | Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev | Ying Wang | 2012-08-14 | 3 | -12/+5 |
|\ \ \ \ | |||||
| * | | | | Adopt the new prebuilts/ndk/<number> paths. | Ying Wang | 2012-08-14 | 3 | -12/+5 |
| |/ / / | |||||
* | | | | am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16" | Jean-Baptiste Queru | 2012-08-14 | 1 | -1/+0 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | am 4eddad55: Merge "Set the AOSP master to be API level 16" | Jean-Baptiste Queru | 2012-08-14 | 1 | -2/+1 |
| |\ \ | |||||
| | * \ | Merge "Set the AOSP master to be API level 16" | Jean-Baptiste Queru | 2012-08-14 | 1 | -2/+1 |
| | |\ \ | |||||
| | | * | | Set the AOSP master to be API level 16 | Jean-Baptiste Queru | 2012-08-14 | 1 | -2/+1 |
| | |/ / | |||||
* | | | | am d3d0beca: am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PAC... | Ying Wang | 2012-08-13 | 2 | -8/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES" | Ying Wang | 2012-08-13 | 2 | -8/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "Move the selinux modules to core PRODUCT_PACKAGES" | Ying Wang | 2012-08-13 | 2 | -8/+13 |
| | |\ \ | |||||
| | | * | | Move the selinux modules to core PRODUCT_PACKAGES | Ying Wang | 2012-08-13 | 2 | -8/+13 |
| | |/ / | |||||
* | | | | am d7547163: am 679b7498: Merge "Add mac_permissions.xml dependency." | Ying Wang | 2012-08-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 679b7498: Merge "Add mac_permissions.xml dependency." | Ying Wang | 2012-08-13 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "Add mac_permissions.xml dependency." | Ying Wang | 2012-08-13 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Add mac_permissions.xml dependency. | rpcraig | 2012-07-20 | 1 | -1/+1 |
* | | | | | resolved conflicts for merge of 0ac38a4e to jb-mr1-dev | Elliott Hughes | 2012-08-11 | 1 | -185/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 20e713d1: Merge "Remove TARGET_linux-sh.mk." | Elliott Hughes | 2012-08-11 | 1 | -185/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Remove TARGET_linux-sh.mk." | Elliott Hughes | 2012-08-11 | 1 | -185/+0 |
| | |\ \ \ | |||||
| | | * | | | Remove TARGET_linux-sh.mk. | Elliott Hughes | 2012-08-10 | 1 | -185/+0 |
| | |/ / / | |||||
* | | | | | Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev | Nick Pelly | 2012-08-10 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Include FusedLocation.apk on all builds. | Nick Pelly | 2012-08-10 | 1 | -0/+1 |
* | | | | | | Merge "Use new flag for emma instrumented build and limit to apps only" into ... | Guang Zhu | 2012-08-10 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use new flag for emma instrumented build and limit to apps only | Guang Zhu | 2012-08-08 | 1 | -0/+15 |
* | | | | | | | add libstagefright_chromium_http to mini for streaming | Keun young Park | 2012-08-10 | 1 | -0/+2 |
* | | | | | | | Merge "arm: add --warn-shared-textrel" into jb-mr1-dev | Nick Kralevich | 2012-08-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | arm: add --warn-shared-textrel | Nick Kralevich | 2012-08-10 | 1 | -0/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh" | Jean-Baptiste Queru | 2012-08-10 | 6 | -9/+32 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh" | Jean-Baptiste Queru | 2012-08-10 | 6 | -9/+32 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge "MIPS support to *.mk files and envsetup.sh" | Jean-Baptiste Queru | 2012-08-10 | 6 | -9/+32 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | MIPS support to *.mk files and envsetup.sh | Raghu Gandham | 2012-08-10 | 6 | -9/+32 |
| | |/ / / / / | |||||
* | | | | | | | am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets." | Jean-Baptiste Queru | 2012-08-10 | 9 | -0/+402 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 6e6d92c4: Merge "Support for MIPS Build targets." | Jean-Baptiste Queru | 2012-08-10 | 9 | -0/+402 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Support for MIPS Build targets." | Jean-Baptiste Queru | 2012-08-10 | 9 | -0/+402 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Support for MIPS Build targets. | Raghu Gandham | 2012-08-01 | 9 | -0/+402 |
* | | | | | | | | resolved conflicts for merge of dd14acc3 to jb-mr1-dev | Jean-Baptiste Queru | 2012-08-10 | 3 | -9/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am e443a9e9: Merge "Modify full_mips-eng build in line with the full-eng build" | Jean-Baptiste Queru | 2012-08-10 | 3 | -11/+8 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Modify full_mips-eng build in line with the full-eng build" | Jean-Baptiste Queru | 2012-08-10 | 3 | -11/+8 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Modify full_mips-eng build in line with the full-eng build | Chris Dearman | 2012-08-01 | 3 | -11/+8 |
* | | | | | | | | am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | JZO40 | The Android Automerger | 2012-08-09 | 1 | -13/+3 |
| | * | | | | | | | merge in jb-mr0-release history after reset to jb-dev | The Android Automerger | 2012-08-09 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | Merge "Add make_ext4fs to all builds" into jb-mr1-dev | Kenny Root | 2012-08-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ |